Author: stsp
Date: Mon Jan 7 13:16:37 2019
New Revision: 1850637
URL: http://svn.apache.org/viewvc?rev=1850637&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Load mod_access_compat into httpd 2.4.
Otherwise, "mod_authz_svn_tests.py 2: test mixed anonymous and authenticated
access" will fail and I haven't found any other way to make it work.
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=1850637&r1=1850636&r2=1850637&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Jan 7 13:16:37 2019
@@ -826,6 +826,7 @@ $(HTTPD_CONF):
echo >>$@.tmp 'Listen localhost:8080'
echo >>$@.tmp 'LoadModule unixd_module modules/mod_unixd.so'
echo >>$@.tmp 'LoadModule alias_module modules/mod_alias.so'
+ echo >>$@.tmp 'LoadModule access_compat_module
modules/mod_access_compat.so'
echo >>$@.tmp 'LoadModule authn_core_module modules/mod_authn_core.so'
echo >>$@.tmp 'LoadModule authn_file_module modules/mod_authn_file.so'
echo >>$@.tmp 'LoadModule authz_core_module modules/mod_authz_core.so'
@@ -1800,6 +1801,7 @@ $(HTTPD_CHECK_CONF): $(MOD_DONTDOTHAT_CO
echo >>$@.tmp 'Listen localhost:$(HTTPD_CHECK_PORT)'
echo >>$@.tmp 'LoadModule unixd_module modules/mod_unixd.so'
echo >>$@.tmp 'LoadModule alias_module modules/mod_alias.so'
+ echo >>$@.tmp 'LoadModule access_compat_module
modules/mod_access_compat.so'
echo >>$@.tmp 'LoadModule authn_core_module modules/mod_authn_core.so'
echo >>$@.tmp 'LoadModule authn_file_module modules/mod_authn_file.so'
echo >>$@.tmp 'LoadModule authz_core_module modules/mod_authz_core.so'
@@ -1925,6 +1927,7 @@ endif
echo >>$@.tmp ' AuthName "Subversion Repository"'
echo >>$@.tmp ' AuthUserFile $(HTTPD_CHECK_USERS)'
echo >>$@.tmp ' Require valid-user'
+ echo >>$@.tmp ' Satisfy Any'
ifeq ($(USE_AUTHZ_SHORT_CIRCUIT),yes)
echo >>$@.tmp ' SVNPathAuthz short_circuit'
endif
@@ -2024,6 +2027,7 @@ endif
echo >>$@.tmp ' AuthName "Subversion Repository"'
echo >>$@.tmp ' AuthUserFile $(HTTPD_CHECK_USERS)'
echo >>$@.tmp ' AuthzSendForbiddenOnFailure On'
+ echo >>$@.tmp ' Satisfy All'
echo >>$@.tmp ' <RequireAny>'
echo >>$@.tmp ' Require valid-user'
echo >>$@.tmp ' Require expr req("ALLOW") == "1"'
@@ -2044,6 +2048,7 @@ endif
echo >>$@.tmp ' AuthName "Subversion Repository"'
echo >>$@.tmp ' AuthUserFile $(HTTPD_CHECK_USERS)'
echo >>$@.tmp ' AuthzSendForbiddenOnFailure On'
+ echo >>$@.tmp ' Satisfy All'
echo >>$@.tmp ' <RequireAll>'
echo >>$@.tmp ' Require valid-user'
echo >>$@.tmp ' Require expr req("ALLOW") == "1"'
@@ -2068,6 +2073,7 @@ $(HTTPD_PROXY_CONF): $(HTTPD_CHECK_CONF)
echo >>$@.tmp 'Listen localhost:$(HTTPD_PROXY_PORT)'
echo >>$@.tmp 'LoadModule unixd_module modules/mod_unixd.so'
echo >>$@.tmp 'LoadModule alias_module modules/mod_alias.so'
+ echo >>$@.tmp 'LoadModule access_compat_module
modules/mod_access_compat.so'
echo >>$@.tmp 'LoadModule authn_core_module modules/mod_authn_core.so'
echo >>$@.tmp 'LoadModule authn_file_module modules/mod_authn_file.so'
echo >>$@.tmp 'LoadModule authz_core_module modules/mod_authz_core.so'
