Tools/Scripts/webkitperl/httpd.pm - Issue 47023017: Make http LayoutTests work in Debian with Apache 2.4.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 2 months 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 side-by-side diff with in-line comments

Download patch

Index: Tools/Scripts/webkitperl/httpd.pm

diff --git a/Tools/Scripts/webkitperl/httpd.pm b/Tools/Scripts/webkitperl/httpd.pm

index a38552af8702915743760cbdc2bc8d8156e58e26..f61dfa00b3ea36969bf028896f58d2cfae1c1a84 100644

--- a/Tools/Scripts/webkitperl/httpd.pm

+++ b/Tools/Scripts/webkitperl/httpd.pm

@@ -156,7 +156,7 @@ sub getHTTPDConfigPathForTestDirectory

}

$httpdConfig = "cygwin-httpd.conf"; # This is an apache 1.3 config.

} elsif (isDebianBased()) {

- $httpdConfig = "apache2-debian-httpd.conf";

+ $httpdConfig = "debian-httpd-$apacheVersion.conf";

} elsif (isFedoraBased()) {

$httpdConfig = "fedora-httpd-$apacheVersion.conf";

} else {

« 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 »