X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Flib-httpd%2Fapache.conf;h=af6e5e1d6ae503dfadc94feef4d9cb4b623163ec;hb=7da4e2280ccaf5ecb357f7cb2b81d62f78f00f9e;hp=f460e404169bba1c57a48a3aac1df2f2b97d0b99;hpb=e785dadc90df20e1038c053dc168a6458b1e672b;p=git.git diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index f460e4041..0fe3fd0d0 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -1,4 +1,5 @@ ServerName dummy +LockFile accept.lock PidFile httpd.pid DocumentRoot www LogFormat "%h %l %u %t \"%r\" %>s %b" common @@ -7,12 +8,28 @@ ErrorLog error.log LoadModule log_config_module modules/mod_log_config.so + + LoadModule alias_module modules/mod_alias.so + + + LoadModule cgi_module modules/mod_cgi.so + + + LoadModule env_module modules/mod_env.so + - - LoadModule log_config_module modules/mod_log_config.so - LockFile accept.lock - PidFile httpd.pid - +Alias /dumb/ www/ + + + SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} + +ScriptAlias /smart/ ${GIT_EXEC_PATH}/git-http-backend/ + + Options None + + + Options ExecCGI + LoadModule ssl_module modules/mod_ssl.so @@ -31,7 +48,7 @@ SSLEngine On LoadModule dav_fs_module modules/mod_dav_fs.so DAVLockDB DAVLock - + Dav on