Noorul Islam K M wrote on Wed, Jun 29, 2011 at 15:43:04 +0530:
> Daniel Shahaf <d...@daniel.shahaf.name> writes:
>
> > Reads fine.
> >
> > I'd like to test this patch (perhaps later this week?).
> >
>
> I tested with short_circuit configuration. I did not see any errors.
>
In these kind of patches when I say "test" I mean "verify that the
configuration intended to take effect, does". Thanks for reporting your
results.
> > Would
> > make davautocheck ENVVAR=short_circuit
> > be a better interface?
> >
>
> I made it this way.
>
> make davautocheck SVN_PATH_AUTHZ=short_circuit
>
I take it you agree with me then :-)
Anyway, +1 to the interface. I'll probably commit this patch (i.e., its
followup that you've posted) once I've tested it. Thanks!
> Attached is the patch.
>
> Log
>
> [[[
>
> Allow davautocheck to run optionally by setting path based authz as
> "short_circuit".
>
> * Makefile.in
> (davautocheck): Document environment parameter.
>
> * subversion/tests/cmdline/davautocheck.sh:
> Accept and use $SVN_PATH_AUTHZ environment parameter.
> ]]]
>
> Thanks and Regards
> Noorul
>
> Index: Makefile.in
> ===================================================================
> --- Makefile.in (revision 1141012)
> +++ Makefile.in (working copy)
> @@ -501,7 +501,7 @@
> # 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.
> + @# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
> @APXS=$(APXS) bash
> $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
>
> # First, run:
> Index: subversion/tests/cmdline/davautocheck.sh
> ===================================================================
> --- subversion/tests/cmdline/davautocheck.sh (revision 1141012)
> +++ subversion/tests/cmdline/davautocheck.sh (working copy)
> @@ -67,6 +67,9 @@
> #
> # To prevent the server from advertising httpv2, pass USE_HTTPV1 in
> # the environment.
> +#
> +# To use value for "SVNPathAuthz" directive set SVN_PATH_AUTHZ with
> +# appropriate value in the environment.
> #
> # Passing --no-tests as argv[1] will have the script start a server
> # but not run any tests.
> @@ -160,6 +163,12 @@
> ADVERTISE_V2_PROTOCOL=off
> fi
>
> +# Pick up $USE_AUTHZ_SHORT_CIRCUIT
> +SVN_PATH_AUTHZ_LINE=""
> +if [ ${SVN_PATH_AUTHZ:+set} ]; then
> + SVN_PATH_AUTHZ_LINE="SVNPathAuthz ${SVN_PATH_AUTHZ}"
> +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
> @@ -326,6 +335,7 @@
> AuthUserFile $HTTPD_USERS
> Require valid-user
> SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
> + ${SVN_PATH_AUTHZ_LINE}
> </Location>
> <Location /svn-test-work/local_tmp/repos>
> DAV svn
> @@ -336,6 +346,7 @@
> AuthUserFile $HTTPD_USERS
> Require valid-user
> SVNAdvertiseV2Protocol ${ADVERTISE_V2_PROTOCOL}
> + ${SVN_PATH_AUTHZ_LINE}
> </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
