VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-13 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix upgrading examples

Browse Source 
- 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/trunk@1819907 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Covener
2018-01-02 22:25:23 +00:00
parent 49b0ef1e91
commit 8fbe0892ec
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
docs/manual/upgrading.xml
View File

@ -264,9 +264,11 @@ access.log - GET /server-status 200 127.0.0.1
<example> <example>
<title>2.2 configuration:</title> <title>2.2 configuration:</title>
<highlight language="config"> <highlight language="config">
# 2.2 config that disables host-based access control and uses only authentication
Order Deny,Allow Order Deny,Allow
Deny from all Allow from all
AuthBasicProvider File AuthType Basic
AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd AuthUserFile /example.com/conf/users.passwd
AuthName secure AuthName secure
Require valid-user Require valid-user
@ -275,8 +277,9 @@ Require valid-user
<example> <example>
<title>2.4 configuration:</title> <title>2.4 configuration:</title>
<highlight language="config"> <highlight language="config">
# No replacement needed # No replacement of disabling host-based access control needed
AuthBasicProvider File AuthType Basic
AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd AuthUserFile /example.com/conf/users.passwd
AuthName secure AuthName secure
Require valid-user Require valid-user
@ -293,7 +296,8 @@ Deny from all
# Satisfy ALL is the default # Satisfy ALL is the default
Satisfy ALL Satisfy ALL
Allow from 127.0.0.1 Allow from 127.0.0.1
AuthBasicProvider File AuthType Basic
AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd AuthUserFile /example.com/conf/users.passwd
AuthName secure AuthName secure
Require valid-user Require valid-user
@ -302,7 +306,8 @@ Require valid-user
<example> <example>
<title>2.4 configuration:</title> <title>2.4 configuration:</title>
<highlight language="config"> <highlight language="config">
AuthBasicProvider File AuthType Basic
AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd AuthUserFile /example.com/conf/users.passwd
AuthName secure AuthName secure
&lt;RequireAll&gt; &lt;RequireAll&gt;
@ -321,7 +326,8 @@ Order allow,deny
Deny from all Deny from all
Satisfy any Satisfy any
Allow from 127.0.0.1 Allow from 127.0.0.1
AuthBasicProvider File AuthType Basic
AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd AuthUserFile /example.com/conf/users.passwd
AuthName secure AuthName secure
Require valid-user Require valid-user
@ -330,7 +336,8 @@ Require valid-user
<example> <example>
<title>2.4 configuration:</title> <title>2.4 configuration:</title>
<highlight language="config"> <highlight language="config">
AuthBasicProvider File AuthType Basic
AuthBasicProvider file
AuthUserFile /example.com/conf/users.passwd AuthUserFile /example.com/conf/users.passwd
AuthName secure AuthName secure
# Implicitly &lt;RequireAny&gt; # Implicitly &lt;RequireAny&gt;