diff options
| author | Eric Covener <covener@apache.org> | 2018-01-02 22:25:59 +0000 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2018-01-02 22:25:59 +0000 |
| commit | 152969281acb95e4477ee7771401cd8a7b93e32e (patch) | |
| tree | 10bb3e7988ede7a6ca7a30da763d287b072cc442 | |
| parent | 23ce73f329d38ee4a25c97e02d8c8e6d4997e867 (diff) | |
| download | httpd-152969281acb95e4477ee7771401cd8a7b93e32e.tar.gz | |
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1819908 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | docs/manual/upgrading.xml | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml index c3899d5318..886f000145 100644 --- a/docs/manual/upgrading.xml +++ b/docs/manual/upgrading.xml @@ -264,9 +264,11 @@ access.log - GET /server-status 200 127.0.0.1 <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> |