svn commit: r1838632 - in /tomcat/jk/trunk: conf/httpd-jk.conf xdocs/common_howto/loadbalancers.xml xdocs/common_howto/workers.xml xdocs/jk2/vhosthowto.xml xdocs/miscellaneous/changelog.xml xdocs/webserver_howto/apache.xml

[markt]

Author: markt
Date: Wed Aug 22 12:24:46 2018
New Revision: 1838632

URL: http://svn.apache.org/viewvc?rev=1838632&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57946
Update the documentation to use httpd 2.4.x style access control directives.

Modified:
    tomcat/jk/trunk/conf/httpd-jk.conf
    tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml
    tomcat/jk/trunk/xdocs/common_howto/workers.xml
    tomcat/jk/trunk/xdocs/jk2/vhosthowto.xml
    tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
    tomcat/jk/trunk/xdocs/webserver_howto/apache.xml

Modified: tomcat/jk/trunk/conf/httpd-jk.conf
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/conf/httpd-jk.conf?rev=1838632&r1=1838631&r2=1838632&view=diff
==============================================================================
--- tomcat/jk/trunk/conf/httpd-jk.conf (original)
+++ tomcat/jk/trunk/conf/httpd-jk.conf Wed Aug 22 12:24:46 2018
@@ -80,16 +80,12 @@ LoadModule jk_module modules/mod_jk.so
     <Location /jk-status>
         # Inside Location we can omit the URL in JkMount
         JkMount jk-status
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1
+        Require ip 127.0.0.1
     </Location>
     <Location /jk-manager>
         # Inside Location we can omit the URL in JkMount
         JkMount jk-manager
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1
+        Require ip 127.0.0.1
     </Location>
 
     # If you want to put all mounts into an external file

Modified: tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml?rev=1838632&r1=1838631&r2=1838632&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml Wed Aug 22 12:24:46 
2018
@@ -222,9 +222,7 @@ HTTP Servers use:</p>
   # Enable the JK manager access from localhost only
  &lt;Location /jkmanager/&gt;
     JkMount jkstatus
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1
+    Require ip 127.0.0.1
  &lt;/Location&gt;
 </source>
 

Modified: tomcat/jk/trunk/xdocs/common_howto/workers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/workers.xml?rev=1838632&r1=1838631&r2=1838632&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/common_howto/workers.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/workers.xml Wed Aug 22 12:24:46 2018
@@ -301,9 +301,7 @@ HTTP Servers use:</p>
   # Enable the JK manager access from localhost only
  &lt;Location /jkmanager/&gt;
     JkMount jkstatus
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1
+    Require ip 127.0.0.1
  &lt;/Location&gt;
 </source>
 

Modified: tomcat/jk/trunk/xdocs/jk2/vhosthowto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/jk2/vhosthowto.xml?rev=1838632&r1=1838631&r2=1838632&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/jk2/vhosthowto.xml (original)
+++ tomcat/jk/trunk/xdocs/jk2/vhosthowto.xml Wed Aug 22 12:24:46 2018
@@ -566,8 +566,7 @@ DirectoryIndex index.html index.jsp
 &lt;/Directory&gt;
 
 &lt;Files ~ "^\.ht"&gt;
-    Order allow,deny
-    Deny from all
+    Require all denied
 &lt;/Files&gt;
 
 &lt;Location /WEB-INF/&gt;

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1838632&r1=1838631&r2=1838632&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Aug 22 12:24:46 2018
@@ -49,6 +49,10 @@
         since there has not been a supported version of Netware available for
         over five years. (markt)
       </update>
+      <update>
+        <bug>57946</bug>: Apache: Update the documentation to use httpd 2.4.x
+        style access control directives. (markt)
+      </update>
       <fix>
         <bug>58287</bug>: Common: Use Local, rather than Global, mutexs on
         Windows to better support multi-user environments. (markt)

Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1838632&r1=1838631&r2=1838632&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Wed Aug 22 12:24:46 2018
@@ -845,8 +845,7 @@ directive when jk and alias/userdir URLs
       &lt;Directory "/home/dataxxx"&gt;
           Options Indexes MultiViews
           AllowOverride None
-          Order allow,deny
-          Allow from all
+          Require all granted
       &lt;/Directory&gt;
 
       JkMount /* myssys-xxx



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org