Author: stsp
Date: Fri May 20 12:57:37 2011
New Revision: 1125363
URL: http://svn.apache.org/viewvc?rev=1125363&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Optionally put authz short_circuit option
into httpd config file.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1125363&r1=1125362&r2=1125363&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Fri May 20 12:57:37 2011
@@ -32,6 +32,7 @@ ENABLE_JAVA_BINDINGS ?= no # they don't
USE_APR_ICONV ?= no # set to yes to use APR iconv instead of GNU iconv
PARALLEL ?= PARALLEL=1 CLEANUP=1
USE_HTTPV1 ?= no
+USE_AUTHZ_SHORT_CIRCUIT ?= no
PWD = $(shell pwd)
UNAME = $(shell uname)
@@ -1050,6 +1051,9 @@ httpd-conf:
ifeq ($(USE_HTTPV1),yes)
echo " SVNAdvertiseV2Protocol off" >> $(HTTPD_CHECK_CONF)
endif
+ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes)
+ echo " SVNPathAuthz short_circuit" >> $(HTTPD_CHECK_CONF)
+endif
echo "</Location>" >> $(HTTPD_CHECK_CONF)
echo "<Location /svn-test-work/local_tmp/repos>" >> $(HTTPD_CHECK_CONF)
echo " DAV svn" >> $(HTTPD_CHECK_CONF)
@@ -1062,6 +1066,9 @@ endif
ifeq ($(USE_HTTPV1),yes)
echo " SVNAdvertiseV2Protocol off" >> $(HTTPD_CHECK_CONF)
endif
+ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes)
+ echo " SVNPathAuthz short_circuit" >> $(HTTPD_CHECK_CONF)
+endif
echo "</Location>" >> $(HTTPD_CHECK_CONF)
echo "# This Location lets you access repositories dropped in /tmp/" >>
$(HTTPD_CHECK_CONF)
echo "<Location /svn>" >> $(HTTPD_CHECK_CONF)
@@ -1071,6 +1078,9 @@ endif
ifeq ($(USE_HTTPV1),yes)
echo " SVNAdvertiseV2Protocol off" >> $(HTTPD_CHECK_CONF)
endif
+ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes)
+ echo " SVNPathAuthz short_circuit" >> $(HTTPD_CHECK_CONF)
+endif
echo "</Location>" >> $(HTTPD_CHECK_CONF)
echo 'RedirectMatch permanent
^/svn-test-work/repositories/REDIRECT-PERM-(.*)$$
/svn-test-work/repositories/$$1' >> $(HTTPD_CHECK_CONF)
echo 'RedirectMatch ^/svn-test-work/repositories/REDIRECT-TEMP-(.*)$$
/svn-test-work/repositories/$$1' >> $(HTTPD_CHECK_CONF)
