зеркало из https://github.com/microsoft/git.git
http: fix v1 protocol tests with apache httpd < 2.4
The apache config used by tests was updated to use the SetEnvIf
directive to set the Git-Protocol header in 19113a26b6
("http: tell
server that the client understands v1", 2017-10-16).
Setting the Git-Protocol header is restricted to httpd >= 2.4, but
mod_setenvif and the SetEnvIf directive work with lower versions, at
least as far back as 2.0, according to the httpd documentation:
https://httpd.apache.org/docs/2.0/mod/mod_setenvif.html
Drop the restriction. Tested with httpd 2.2 and 2.4.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Acked-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
6464679d96
Коммит
a812952aab
|
@ -25,6 +25,9 @@ ErrorLog error.log
|
||||||
<IfModule !mod_headers.c>
|
<IfModule !mod_headers.c>
|
||||||
LoadModule headers_module modules/mod_headers.so
|
LoadModule headers_module modules/mod_headers.so
|
||||||
</IfModule>
|
</IfModule>
|
||||||
|
<IfModule !mod_setenvif.c>
|
||||||
|
LoadModule setenvif_module modules/mod_setenvif.so
|
||||||
|
</IfModule>
|
||||||
|
|
||||||
<IfVersion < 2.4>
|
<IfVersion < 2.4>
|
||||||
LockFile accept.lock
|
LockFile accept.lock
|
||||||
|
@ -67,9 +70,6 @@ LockFile accept.lock
|
||||||
<IfModule !mod_unixd.c>
|
<IfModule !mod_unixd.c>
|
||||||
LoadModule unixd_module modules/mod_unixd.so
|
LoadModule unixd_module modules/mod_unixd.so
|
||||||
</IfModule>
|
</IfModule>
|
||||||
<IfModule !mod_setenvif.c>
|
|
||||||
LoadModule setenvif_module modules/mod_setenvif.so
|
|
||||||
</IfModule>
|
|
||||||
</IfVersion>
|
</IfVersion>
|
||||||
|
|
||||||
PassEnv GIT_VALGRIND
|
PassEnv GIT_VALGRIND
|
||||||
|
@ -79,9 +79,7 @@ PassEnv ASAN_OPTIONS
|
||||||
PassEnv GIT_TRACE
|
PassEnv GIT_TRACE
|
||||||
PassEnv GIT_CONFIG_NOSYSTEM
|
PassEnv GIT_CONFIG_NOSYSTEM
|
||||||
|
|
||||||
<IfVersion >= 2.4>
|
SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
|
||||||
SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
|
|
||||||
</IfVersion>
|
|
||||||
|
|
||||||
Alias /dumb/ www/
|
Alias /dumb/ www/
|
||||||
Alias /auth/dumb/ www/auth/dumb/
|
Alias /auth/dumb/ www/auth/dumb/
|
||||||
|
|
Загрузка…
Ссылка в новой задаче