kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'bw/protocol-v1' 

Test fix for a topic already in 'master'.

* bw/protocol-v1:
  http: fix v1 protocol tests with apache httpd < 2.4
maint
Junio C Hamano 2018-01-09 14:32:56 -08:00
parent 14c84cd55b a812952aab
commit 4e51984e82
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/lib-httpd/apache.conf
View File

@ -25,6 +25,9 @@ ErrorLog error.log
<IfModule !mod_headers.c>
LoadModule headers_module modules/mod_headers.so
</IfModule>
<IfModule !mod_setenvif.c>
LoadModule setenvif_module modules/mod_setenvif.so
</IfModule>

<IfVersion < 2.4>
LockFile accept.lock
@ -67,9 +70,6 @@ LockFile accept.lock
<IfModule !mod_unixd.c>
LoadModule unixd_module modules/mod_unixd.so
</IfModule>
<IfModule !mod_setenvif.c>
LoadModule setenvif_module modules/mod_setenvif.so
</IfModule>
</IfVersion>

PassEnv GIT_VALGRIND
@ -79,9 +79,7 @@ PassEnv ASAN_OPTIONS
PassEnv GIT_TRACE
PassEnv GIT_CONFIG_NOSYSTEM

<IfVersion >= 2.4>
SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
</IfVersion>
SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0

Alias /dumb/ www/
Alias /auth/dumb/ www/auth/dumb/