All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Subject: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4
Date: Wed,  8 Apr 2015 17:05:26 +0200	[thread overview]
Message-ID: <0631c09d394dedb803a100e81ce4052a57b4e73e.1428505184.git.git@drmicha.warpmail.net> (raw)
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

  parent reply	other threads:[~2015-04-08 15:05 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-08 15:05 [PATCH 0/3] Make httpd tests run Michael J Gruber
2015-04-08 15:05 ` [PATCH 1/3] t/lib-httpd: load mod_unixd Michael J Gruber
     [not found]   ` <5525A208.6060807@web.de>
2015-04-09  9:27     ` Michael J Gruber
2015-04-10  3:09       ` Jeff King
2015-04-08 15:05 ` [PATCH 2/3] t/lib-git-svn: check same httpd module dirs as lib-httpd Michael J Gruber
2015-04-08 15:05 ` Michael J Gruber [this message]
2015-04-08 20:26   ` [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4 Eric Wong
2015-04-09  9:33     ` Michael J Gruber
2015-04-09 19:11       ` Eric Wong
2015-04-10  3:23   ` Jeff King
2015-04-10  3:39     ` Jeff King
2015-04-13 10:14       ` Michael J Gruber
2015-04-09 13:04 ` [PATCH 0/3] Make httpd tests run Kyle J. McKay
2015-04-09 13:14   ` Kyle J. McKay
2015-05-11 11:54     ` [PATCHv2 0/4] Make httpd tests run v2 Michael J Gruber
2015-05-11 11:54       ` [PATCHv2 1/4] t/lib-httpd: load mod_unixd Michael J Gruber
2015-05-11 11:54       ` [PATCHv2 2/4] t/lib-git-svn: check same httpd module dirs as lib-httpd Michael J Gruber
2015-05-11 11:54       ` [PATCH 3/4] t/t91*: do not say how to avoid the tests Michael J Gruber
2015-05-11 11:54       ` [PATCHv2 4/4 (was 3/3, still WIP)] t/lib-git-svn: adjust config to apache 2.4 WIP Michael J Gruber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0631c09d394dedb803a100e81ce4052a57b4e73e.1428505184.git.git@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.