You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2018/01/02 22:25:59 UTC
svn commit: r1819908 - /httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml
Author: covener
Date: Tue Jan 2 22:25:59 2018
New Revision: 1819908
URL: http://svn.apache.org/viewvc?rev=1819908&view=rev
Log:
Merge r1819907 from trunk:
Fix upgrading examples
- providers are case sensitive
- description didn't match example / 2.2 didn't match 2.4.
Submitted by: Hank Ibell
Committed by: covener
Modified:
httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml
Modified: httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml?rev=1819908&r1=1819907&r2=1819908&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/upgrading.xml Tue Jan 2 22:25:59 2018
@@ -264,9 +264,11 @@ access.log - GET /server-status 200 127.
<example>
<title>2.2 configuration:</title>
<highlight language="config">
+# 2.2 config that disables host-based access control and uses only authentication
Order Deny,Allow
-Deny from all
-AuthBasicProvider File
+Allow from all
+AuthType Basic
+AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd
AuthName secure
Require valid-user
@@ -275,8 +277,9 @@ Require valid-user
<example>
<title>2.4 configuration:</title>
<highlight language="config">
-# No replacement needed
-AuthBasicProvider File
+# No replacement of disabling host-based access control needed
+AuthType Basic
+AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd
AuthName secure
Require valid-user
@@ -293,7 +296,8 @@ Deny from all
# Satisfy ALL is the default
Satisfy ALL
Allow from 127.0.0.1
-AuthBasicProvider File
+AuthType Basic
+AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd
AuthName secure
Require valid-user
@@ -302,7 +306,8 @@ Require valid-user
<example>
<title>2.4 configuration:</title>
<highlight language="config">
-AuthBasicProvider File
+AuthType Basic
+AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd
AuthName secure
<RequireAll>
@@ -321,7 +326,8 @@ Order allow,deny
Deny from all
Satisfy any
Allow from 127.0.0.1
-AuthBasicProvider File
+AuthType Basic
+AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd
AuthName secure
Require valid-user
@@ -330,7 +336,8 @@ Require valid-user
<example>
<title>2.4 configuration:</title>
<highlight language="config">
-AuthBasicProvider File
+AuthType Basic
+AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd
AuthName secure
# Implicitly <RequireAny>