You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2012/02/21 06:02:41 UTC
svn commit: r1291594 -
/subversion/trunk/subversion/tests/cmdline/davautocheck.sh
Author: danielsh
Date: Tue Feb 21 05:02:40 2012
New Revision: 1291594
URL: http://svn.apache.org/viewvc?rev=1291594&view=rev
Log:
httpd-2.4 compatibility for davautocheck.
* subversion/tests/cmdline/davautocheck.sh:
Port the LockFile/User/Group directive to 2.4 equivalents
(currently just a comment asking whether a 'Mutex' directive
is needed).
Modified:
subversion/trunk/subversion/tests/cmdline/davautocheck.sh
Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1291594&r1=1291593&r2=1291594&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Tue Feb 21 05:02:40 2012
@@ -292,9 +292,22 @@ $LOAD_MOD_AUTHZ_USER
$LOAD_MOD_AUTHZ_HOST
LoadModule authz_svn_module "$MOD_AUTHZ_SVN"
+__EOF__
+
+if "$HTTPD" -v | grep '/2\.[012]' >/dev/null; then
+ cat >> "$HTTPD_CFG" <<__EOF__
LockFile lock
User $(id -un)
Group $(id -gn)
+__EOF__
+else
+ cat >> "$HTTPD_CFG" <<__EOF__
+# TODO: maybe uncomment this for prefork,worker MPMs only?
+# Mutex file:lock mpm-accept
+__EOF__
+fi
+
+cat >> "$HTTPD_CFG" <<__EOF__
Listen $HTTPD_PORT
ServerName localhost
PidFile "$HTTPD_PID"