Merge branch 'tr/maint-merge-ours-clarification' (early part)

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index af6e5e1d6ae503dfadc94feef4d9cb4b623163ec..0fe3fd0d012159f6abe7f7d8b006d3f8e59cbab3 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -1,15 +1,35 @@
 ServerName dummy
+LockFile accept.lock
 PidFile httpd.pid
 DocumentRoot www
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
 CustomLog access.log common
 ErrorLog error.log
-
-<IfDefine Darwin>
+<IfModule !mod_log_config.c>
        LoadModule log_config_module modules/mod_log_config.so
-       LockFile accept.lock
-       PidFile httpd.pid
-</IfDefine>
+</IfModule>
+<IfModule !mod_alias.c>
+       LoadModule alias_module modules/mod_alias.so
+</IfModule>
+<IfModule !mod_cgi.c>
+       LoadModule cgi_module modules/mod_cgi.so
+</IfModule>
+<IfModule !mod_env.c>
+       LoadModule env_module modules/mod_env.so
+</IfModule>
+
+Alias /dumb/ www/
+
+<Location /smart/>
+       SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
+</Location>
+ScriptAlias /smart/ ${GIT_EXEC_PATH}/git-http-backend/
+<Directory ${GIT_EXEC_PATH}>
+       Options None
+</Directory>
+<Files ${GIT_EXEC_PATH}/git-http-backend>
+       Options ExecCGI
+</Files>
 
 <IfDefine SSL>
 LoadModule ssl_module modules/mod_ssl.so
@@ -28,7 +48,7 @@ SSLEngine On
        LoadModule dav_fs_module modules/mod_dav_fs.so
 
        DAVLockDB DAVLock
-       <Location />
+       <Location /dumb/>
                Dav on
        </Location>
 </IfDefine>