[WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Apr 8, 2015, 15:05 UTC
- Message-ID
- <0631c09d394dedb803a100e81ce4052a57b4e73e.1428505184.git.git@drmicha.warpmail.net>
- In-Reply-To
- <cover.1428505184.git.git@drmicha.warpmail.net>
The current config is tailored to apache 2.2. Apache 2.4 fails to start with it.
Adjust the config to apache 2.4.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> ---
Notes:
This is WIP and RFH. Apache does not start without mpm, and the lock
mechanism has changed. It will run with these changes, but svn fails to
connect.
Again, I'm wondering who is running these tests at all, but also:
Why do we leverage lib-httpd so little from lib-git-svn?t/lib-git-svn.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 2a0ef07..b0ca893 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -117,10 +117,11 @@ ServerName "git svn test" ServerRoot "$GIT_DIR" DocumentRoot "$GIT_DIR" PidFile "$GIT_DIR/httpd.pid" -LockFile logs/accept.lock +Mutex default Listen 127.0.0.1:$SVN_HTTPD_PORT LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so +LoadModule mpm_prefork_module $SVN_HTTPD_MODULE_PATH/mod_mpm_prefork.so <Location /$repo_base_path> DAV svn SVNPath "$rawsvnrepo"
-- 2.4.0.rc1.221.gf7021fb