Author: svn-role
Date: Fri Apr 1 04:00:03 2022
New Revision: 1899462
URL: http://svn.apache.org/viewvc?rev=1899462&view=rev
Log:
Merge r1884474 from trunk:
* r1884474
Fixes authz tests on Windows
Justification:
Should have been part of the r1883838 group that was backported
votes:
+1: jun66j5, markphip, jcorvel
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/win-tests.py
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1884474
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899462&r1=1899461&r2=1899462&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Apr 1 04:00:03 2022
@@ -20,10 +20,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1884474
- Fixes authz tests on Windows
- Justification:
- Should have been part of the r1883838 group that was backported
- votes:
- +1: jun66j5, markphip, jcorvel
Modified: subversion/branches/1.10.x/win-tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/win-tests.py?rev=1899462&r1=1899461&r2=1899462&view=diff
==============================================================================
--- subversion/branches/1.10.x/win-tests.py (original)
+++ subversion/branches/1.10.x/win-tests.py Fri Apr 1 04:00:03 2022
@@ -772,6 +772,9 @@ class Httpd:
local_tmp = os.path.join(self.abs_builddir,
CMDLINE_TEST_SCRIPT_NATIVE_PATH,
'svn-test-work', 'local_tmp')
+ repositories = os.path.join(self.abs_builddir,
+ CMDLINE_TEST_SCRIPT_NATIVE_PATH,
+ 'svn-test-work', 'repositories')
return \
'<Location /authz-test-work/anon>' + '\n' \
' DAV svn' + '\n' \
@@ -787,6 +790,17 @@ class Httpd:
' </IfModule>' + '\n' \
' SVNPathAuthz ' + self.path_authz_option + '\n' \
'</Location>' + '\n' \
+ '<Location /authz-test-work/in-repos-authz>' + '\n' \
+ ' DAV svn' + '\n' \
+ ' SVNParentPath ' + repositories + '\n' \
+ ' AuthzSVNReposRelativeAccessFile "^/authz"\n' \
+ ' SVNAdvertiseV2Protocol ' + self.httpv2_option + '\n' \
+ ' AuthType Basic' + '\n' \
+ ' AuthName "Subversion Repository"' + '\n' \
+ ' AuthUserFile ' + self._quote(self.httpd_users) + '\n' \
+ ' Require valid-user' + '\n' \
+ ' SVNPathAuthz ' + self.path_authz_option + '\n' \
+ '</Location>' + '\n' \
'<Location /authz-test-work/mixed>' + '\n' \
' DAV svn' + '\n' \
' SVNParentPath ' + local_tmp + '\n' \
