Author: danielsh
Date: Thu Apr 14 08:27:41 2011
New Revision: 1092049
URL: http://svn.apache.org/viewvc?rev=1092049&view=rev
Log:
Repeat r1092047 for tools/dev/unix-build/.
* tools/dev/unix-build/Makefile.svn
(USE_HTTPV1): New parameter.
(httpd-conf): Use it.
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=1092049&r1=1092048&r2=1092049&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Thu Apr 14 08:27:41 2011
@@ -31,6 +31,7 @@ ENABLE_PERL_BINDINGS ?= yes
ENABLE_JAVA_BINDINGS ?= no # they don't build with thread-less APR...
USE_APR_ICONV ?= no # set to yes to use APR iconv instead of GNU iconv
PARALLEL ?= PARALLEL=1 CLEANUP=1
+USE_HTTPV1 ?= no
PWD = $(shell pwd)
UNAME = $(shell uname)
@@ -1046,6 +1047,9 @@ httpd-conf:
echo " AuthName \"Subversion Repository\"" >> $(HTTPD_CHECK_CONF)
echo " AuthUserFile $(HTTPD_CHECK_USERS)" >> $(HTTPD_CHECK_CONF)
echo " Require valid-user" >> $(HTTPD_CHECK_CONF)
+ifeq ($(USE_HTTPV1),yes)
+ echo " SVNAdvertiseV2Protocol off" >> $(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)
@@ -1055,12 +1059,18 @@ httpd-conf:
echo " AuthName \"Subversion Repository\"" >> $(HTTPD_CHECK_CONF)
echo " AuthUserFile $(HTTPD_CHECK_USERS)" >> $(HTTPD_CHECK_CONF)
echo " Require valid-user" >> $(HTTPD_CHECK_CONF)
+ifeq ($(USE_HTTPV1),yes)
+ echo " SVNAdvertiseV2Protocol off" >> $(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)
echo " DAV svn" >> $(HTTPD_CHECK_CONF)
echo " SVNParentPath /tmp" >> $(HTTPD_CHECK_CONF)
echo " Allow from all" >> $(HTTPD_CHECK_CONF)
+ifeq ($(USE_HTTPV1),yes)
+ echo " SVNAdvertiseV2Protocol off" >> $(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)
