Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(181)

Side by Side Diff: Tools/Scripts/webkitperl/httpd.pm

Issue 47023017: Make http LayoutTests work in Debian with Apache 2.4. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Picked fixup committed by allan.jensen@digia.com on the same day as the initial patch. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved 1 # Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved
2 # Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 2 # Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
3 # Copyright (C) 2010 Andras Becsi (abecsi@inf.u-szeged.hu), University of Szeged 3 # Copyright (C) 2010 Andras Becsi (abecsi@inf.u-szeged.hu), University of Szeged
4 # Copyright (C) 2011 Research In Motion Limited. All rights reserved. 4 # Copyright (C) 2011 Research In Motion Limited. All rights reserved.
5 # 5 #
6 # Redistribution and use in source and binary forms, with or without 6 # Redistribution and use in source and binary forms, with or without
7 # modification, are permitted provided that the following conditions 7 # modification, are permitted provided that the following conditions
8 # are met: 8 # are met:
9 # 9 #
10 # 1. Redistributions of source code must retain the above copyright 10 # 1. Redistributions of source code must retain the above copyright
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 149
150 if (isCygwin()) { 150 if (isCygwin()) {
151 my $libPHP4DllPath = "/usr/lib/apache/libphp4.dll"; 151 my $libPHP4DllPath = "/usr/lib/apache/libphp4.dll";
152 # FIXME: run-webkit-tests should not modify the user's system, especiall y not in this method! 152 # FIXME: run-webkit-tests should not modify the user's system, especiall y not in this method!
153 unless (-x $libPHP4DllPath) { 153 unless (-x $libPHP4DllPath) {
154 copy("$httpdConfDirectory/libphp4.dll", $libPHP4DllPath); 154 copy("$httpdConfDirectory/libphp4.dll", $libPHP4DllPath);
155 chmod(0755, $libPHP4DllPath); 155 chmod(0755, $libPHP4DllPath);
156 } 156 }
157 $httpdConfig = "cygwin-httpd.conf"; # This is an apache 1.3 config. 157 $httpdConfig = "cygwin-httpd.conf"; # This is an apache 1.3 config.
158 } elsif (isDebianBased()) { 158 } elsif (isDebianBased()) {
159 $httpdConfig = "apache2-debian-httpd.conf"; 159 $httpdConfig = "debian-httpd-$apacheVersion.conf";
160 } elsif (isFedoraBased()) { 160 } elsif (isFedoraBased()) {
161 $httpdConfig = "fedora-httpd-$apacheVersion.conf"; 161 $httpdConfig = "fedora-httpd-$apacheVersion.conf";
162 } else { 162 } else {
163 # All other ports use apache2, so just use our default apache2 config. 163 # All other ports use apache2, so just use our default apache2 config.
164 $httpdConfig = "apache2-httpd.conf"; 164 $httpdConfig = "apache2-httpd.conf";
165 } 165 }
166 return "$httpdConfDirectory/$httpdConfig"; 166 return "$httpdConfDirectory/$httpdConfig";
167 } 167 }
168 168
169 sub openHTTPD(@) 169 sub openHTTPD(@)
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 } 338 }
339 339
340 sub getWaitTime 340 sub getWaitTime
341 { 341 {
342 my $waitTime = 0; 342 my $waitTime = 0;
343 if ($waitBeginTime && $waitEndTime) { 343 if ($waitBeginTime && $waitEndTime) {
344 $waitTime = $waitEndTime - $waitBeginTime; 344 $waitTime = $waitEndTime - $waitBeginTime;
345 } 345 }
346 return $waitTime; 346 return $waitTime;
347 } 347 }
OLDNEW
« no previous file with comments | « LayoutTests/http/conf/debian-httpd-2.4.conf ('k') | Tools/Scripts/webkitpy/layout_tests/port/base.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698