Author: svn-role
Date: Tue Mar 29 04:01:19 2022
New Revision: 1899340
URL: http://svn.apache.org/viewvc?rev=1899340&view=rev
Log:
Merge r1892121 from trunk:
* r1892121
Fix an error message when running make davautocheck.
Justification:
davautocheck should work
Votes:
+1: dsahlberg, markphip, stsp
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1892121
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899340&r1=1899339&r2=1899340&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Tue Mar 29 04:01:19 2022
@@ -79,13 +79,6 @@ Approved changes:
Votes:
+1: jamessan, stsp
- * r1892121
- Fix an error message when running make davautocheck.
- Justification:
- davautocheck should work
- Votes:
- +1: dsahlberg, markphip, stsp
-
* r1883355
Use the APR-1.4+ API for flushing file contents to disk.
Justification:
Modified: subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh?rev=1899340&r1=1899339&r2=1899340&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/davautocheck.sh Tue Mar
29 04:01:19 2022
@@ -547,10 +547,9 @@ Alias /fsdavroot $ABS_BUILDDIR/subversio
<Location /svn-test-work/repositories>
__EOF__
-location_common() {
+location_common_without_authz() {
cat >> "$HTTPD_CFG" <<__EOF__
DAV svn
- AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
AuthType Basic
AuthName "Subversion Repository"
AuthUserFile $HTTPD_USERS
@@ -560,6 +559,12 @@ cat >> "$HTTPD_CFG" <<__EOF__
SVNBlockRead ${BLOCK_READ_SETTING}
__EOF__
}
+location_common() {
+location_common_without_authz
+cat >> "$HTTPD_CFG" <<__EOF__
+ AuthzSVNAccessFile
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/authz"
+__EOF__
+}
location_common
cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
@@ -612,7 +617,7 @@ cat >> "$HTTPD_CFG" <<__EOF__
</Location>
<Location /authz-test-work/in-repos-authz>
__EOF__
-location_common
+location_common_without_authz
cat >> "$HTTPD_CFG" <<__EOF__
SVNParentPath
"$ABS_BUILDDIR/subversion/tests/cmdline/svn-test-work/repositories"
Require valid-user
