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 2011/04/14 10:17:41 UTC
svn commit: r1092047 - in /subversion/trunk: Makefile.in
subversion/tests/cmdline/davautocheck.sh
Author: danielsh
Date: Thu Apr 14 08:17:40 2011
New Revision: 1092047
URL: http://svn.apache.org/viewvc?rev=1092047&view=rev
Log:
Allow running davautocheck with HTTPv2 disabled.
* Makefile.in
(davautocheck): Document environment parameters.
* subversion/tests/cmdline/davautocheck.sh:
Accept and use $USE_HTTPV1 environment parameter.
Modified:
subversion/trunk/Makefile.in
subversion/trunk/subversion/tests/cmdline/davautocheck.sh
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1092047&r1=1092046&r2=1092047&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Thu Apr 14 08:17:40 2011
@@ -493,6 +493,7 @@ davcheck: bin $(TEST_DEPS) @BDB_TEST_DEP
# Automatically configure and run Apache httpd on a random port, and then
# run make check.
davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
+ @# Takes MODULE_PATH and USE_HTTPV1 in the environment.
@APXS=$(APXS) bash $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
# First, run:
Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1092047&r1=1092046&r2=1092047&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Thu Apr 14 08:17:40 2011
@@ -64,6 +64,9 @@
#
# APXS=/opt/svn/1.4.x/bin/apxs MODULE_PATH=/opt/svn/1.4.x/modules \
# subversion/tests/cmdline/davautocheck.sh
+#
+# To prevent the server from advertising httpv2, pass USE_HTTPV1 in
+# the environment.
SCRIPTDIR=$(dirname $0)
SCRIPT=$(basename $0)
@@ -148,6 +151,12 @@ unset HTTPS_PROXY
say "Using '$APXS'..."
+# Pick up $USE_HTTPV1
+ADVERTISE_V2_PROTOCOL=on
+if [ ${USE_HTTPV1:+set} ]; then
+ ADVERTISE_V2_PROTOCOL=off
+fi
+
# Find the source and build directories. The build dir can be found if it is
# the current working dir or the source dir.
pushd ${SCRIPTDIR}/../../../ > /dev/null
@@ -313,6 +322,7 @@ CustomLog "$HTTPD_ROOT/ops" "%
AuthName "Subversion Repository"
AuthUserFile $HTTPD_USERS
Require valid-user
+ SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
</Location>
<Location /svn-test-work/local_tmp/repos>
DAV svn
@@ -322,6 +332,7 @@ CustomLog "$HTTPD_ROOT/ops" "%
AuthName "Subversion Repository"
AuthUserFile $HTTPD_USERS
Require valid-user
+ SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
</Location>
RedirectMatch permanent ^/svn-test-work/repositories/REDIRECT-PERM-(.*)\$ /svn-test-work/repositories/\$1
RedirectMatch ^/svn-test-work/repositories/REDIRECT-TEMP-(.*)\$ /svn-test-work/repositories/\$1
Re: svn commit: r1092047 - in /subversion/trunk: Makefile.in
subversion/tests/cmdline/davautocheck.sh
Posted by Daniel Shahaf <da...@apache.org>.
On Thu, 14 Apr 2011 10:38 -0400, "C. Michael Pilato" <cm...@collab.net> wrote:
> On 04/14/2011 09:20 AM, Daniel Shahaf wrote:
> > On Thu, 14 Apr 2011 08:59 -0400, "C. Michael Pilato" <cm...@collab.net> wrote:
> >> On 04/14/2011 04:17 AM, danielsh@apache.org wrote:
> >>> URL: http://svn.apache.org/viewvc?rev=1092047&view=rev
> >>> Log:
> >>> Allow running davautocheck with HTTPv2 disabled.
> >>
> >> I *think* you could probably have done this already by setting
> >> SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2=yes in the environment before kicking
> >> off the 'make davautocheck'.
> >>
> >
> > That's a different beast --- it's a client-side, not server-side, directive.
>
> True, but it's effectively the same result. The server-side directive
> doesn't turn off HTTPv2 support -- only the server's advertisement
> thereof.
Ah, I didn't realize that. I agree then that there would be little
difference between disabling httpv2 in the client or in the server.
> The client-side envvar hack tells the client to ignore the
> advertisement if it comes.
Re: svn commit: r1092047 - in /subversion/trunk: Makefile.in subversion/tests/cmdline/davautocheck.sh
Posted by "C. Michael Pilato" <cm...@collab.net>.
On 04/14/2011 09:20 AM, Daniel Shahaf wrote:
> On Thu, 14 Apr 2011 08:59 -0400, "C. Michael Pilato" <cm...@collab.net> wrote:
>> On 04/14/2011 04:17 AM, danielsh@apache.org wrote:
>>> URL: http://svn.apache.org/viewvc?rev=1092047&view=rev
>>> Log:
>>> Allow running davautocheck with HTTPv2 disabled.
>>
>> I *think* you could probably have done this already by setting
>> SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2=yes in the environment before kicking
>> off the 'make davautocheck'.
>>
>
> That's a different beast --- it's a client-side, not server-side, directive.
True, but it's effectively the same result. The server-side directive
doesn't turn off HTTPv2 support -- only the server's advertisement thereof.
The client-side envvar hack tells the client to ignore the advertisement if
it comes.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn commit: r1092047 - in /subversion/trunk: Makefile.in
subversion/tests/cmdline/davautocheck.sh
Posted by Daniel Shahaf <da...@apache.org>.
On Thu, 14 Apr 2011 08:59 -0400, "C. Michael Pilato" <cm...@collab.net> wrote:
> On 04/14/2011 04:17 AM, danielsh@apache.org wrote:
> > URL: http://svn.apache.org/viewvc?rev=1092047&view=rev
> > Log:
> > Allow running davautocheck with HTTPv2 disabled.
>
> I *think* you could probably have done this already by setting
> SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2=yes in the environment before kicking
> off the 'make davautocheck'.
>
That's a different beast --- it's a client-side, not server-side, directive.
Thanks for the tip though, I've add a placeholder in notes/knobs for it.
Re: svn commit: r1092047 - in /subversion/trunk: Makefile.in subversion/tests/cmdline/davautocheck.sh
Posted by "C. Michael Pilato" <cm...@collab.net>.
On 04/14/2011 04:17 AM, danielsh@apache.org wrote:
> Author: danielsh
> Date: Thu Apr 14 08:17:40 2011
> New Revision: 1092047
>
> URL: http://svn.apache.org/viewvc?rev=1092047&view=rev
> Log:
> Allow running davautocheck with HTTPv2 disabled.
I *think* you could probably have done this already by setting
SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2=yes in the environment before kicking
off the 'make davautocheck'.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand