Commitae252ee

Felipe Zimmerle

committed

Regression tests: makes configuration compatible with 2.2 and 2.4 (try 2)

1 parent65d9272 commitae252eeCopy full SHA for ae252ee

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,5 @@`
`1`	`1`	`### Base configuration for starting Apache httpd`
`2`	`2`
`3`		`-<IfModule !mod_authz_core.c>`
`4`		`- LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so`
`5`		`- LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so`
`6`		`-</IfModule>`
`7`		`-`
`8`	`3`	`<IfDefine !CHROOT>`
`9`	`4`	`# File locations`
`10`	`5`	`PidFile @MSC_REGRESSION_LOGS_DIR@/httpd.pid`
`@@ -31,19 +26,24 @@ CoreDumpDirectory @MSC_REGRESSION_SERVERROOT_DIR@/tmp`
`31`	`26`	`LogLevel debug`
`32`	`27`	`ErrorLog @MSC_REGRESSION_LOGS_DIR@/error.log`
`33`	`28`
	`29`	`+<IfVersion >= 2.4>`
	`30`	`+ LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so`
	`31`	`+ LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so`
	`32`	`+</IfVersion>`
	`33`	`+`
`34`	`34`	`<IfDefine !CHROOT>`
`35`	`35`	`DocumentRoot @MSC_REGRESSION_DOCROOT_DIR@`
`36`	`36`	`<Directory "@MSC_REGRESSION_DOCROOT_DIR@">`
`37`	`37`	`Options +Indexes +FollowSymLinks`
`38`	`38`	`AllowOverride None`
`39`		`- Allow from all`
`40`	`39`
`41`		`- <IfModule !mod_authz_core.c>`
	`40`	`+ <IfVersion >= 2.4>`
	`41`	`+ Allow from all`
`42`	`42`	`Satisfy Any`
`43`		`- </IfModule>`
	`43`	`+ </IfVersion>`
`44`	`44`
`45`		`- <IfModule mod_authz_core.c>`
	`45`	`+ <IfVersion < 2.4>`
`46`	`46`	`Require all granted`
`47`		`- </IfModule>`
	`47`	`+ </IfVersion>`
`48`	`48`	`</Directory>`
`49`	`49`	`</IfDefine>`

Comments

(0)