]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
override index: update missing <override>s in directives
authorJacob Champion <jchampion@apache.org>
Thu, 4 May 2017 23:41:19 +0000 (23:41 +0000)
committerJacob Champion <jchampion@apache.org>
Thu, 4 May 2017 23:41:19 +0000 (23:41 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793934 13f79535-47bb-0310-9956-ffa450edef68

21 files changed:
docs/manual/mod/core.xml
docs/manual/mod/mod_auth_form.xml
docs/manual/mod/mod_authnz_fcgi.xml
docs/manual/mod/mod_authz_core.xml
docs/manual/mod/mod_deflate.xml
docs/manual/mod/mod_example_hooks.xml
docs/manual/mod/mod_http2.xml
docs/manual/mod/mod_include.xml
docs/manual/mod/mod_ldap.xml
docs/manual/mod/mod_logio.xml
docs/manual/mod/mod_lua.xml
docs/manual/mod/mod_macro.xml
docs/manual/mod/mod_proxy_express.xml
docs/manual/mod/mod_proxy_fcgi.xml
docs/manual/mod/mod_proxy_hcheck.xml
docs/manual/mod/mod_session.xml
docs/manual/mod/mod_session_cookie.xml
docs/manual/mod/mod_session_crypto.xml
docs/manual/mod/mod_session_dbd.xml
docs/manual/mod/mod_ssl.xml
docs/manual/mod/mod_xml2enc.xml

index faed53ea4512d2257d8eff4dc1fe5d2648538cc4..18b28209eda45ec3ec9830679ed3a7536bdc001d 100644 (file)
@@ -1398,6 +1398,7 @@ EnableSendfile On
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
+<override>All</override>
 <compatibility>2.3.9 and later</compatibility>
 
 <usage>
@@ -2317,6 +2318,7 @@ if file exists at startup</description>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
+<override>All</override>
 
 <usage>
     <p>The <code>&lt;IfFile <var>filename</var>&gt;...&lt;/IfFile&gt;
@@ -5113,6 +5115,7 @@ for external processing, e.g. to a CGI script.</p>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
+<override>All</override>
 <compatibility>2.5 and later</compatibility>
 
 <usage>
index 5305d56a5987200743064efc4909a290991dd793..4f2f8a97fd4365d083f7da92f843229994e43f81 100644 (file)
@@ -415,6 +415,7 @@ lower level modules</description>
 <default>httpd_username</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later</compatibility>
 
 <usage>
@@ -431,6 +432,7 @@ lower level modules</description>
 <default>httpd_password</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later</compatibility>
 
 <usage>
@@ -447,6 +449,7 @@ lower level modules</description>
 <default>httpd_location</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later</compatibility>
 
 <usage>
@@ -463,6 +466,7 @@ lower level modules</description>
 <default>httpd_method</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later</compatibility>
 
 <usage>
@@ -486,6 +490,7 @@ lower level modules</description>
 <default>httpd_mimetype</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later</compatibility>
 
 <usage>
@@ -509,6 +514,7 @@ lower level modules</description>
 <default>httpd_body</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later</compatibility>
 
 <usage>
@@ -558,6 +564,7 @@ lower level modules</description>
 <default>none</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later. The use of the expression
 parser has been added in 2.4.4.</compatibility>
 
@@ -582,6 +589,7 @@ parser has been added in 2.4.4.</compatibility>
 <default>none</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later. The use of the expression
 parser has been added in 2.4.4.</compatibility>
 
@@ -605,6 +613,7 @@ parser has been added in 2.4.4.</compatibility>
 <default>AuthFormFakeBasicAuth Off</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later</compatibility>
 
 <usage>
@@ -624,6 +633,7 @@ parser has been added in 2.4.4.</compatibility>
 <default>none</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later. The use of the expression
 parser has been added in 2.4.4.</compatibility>
 
@@ -662,6 +672,7 @@ parser has been added in 2.4.4.</compatibility>
 <default>AuthFormDisableNoStore Off</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later</compatibility>
 
 <usage>
@@ -682,6 +693,7 @@ parser has been added in 2.4.4.</compatibility>
 <default>none</default>
 <contextlist><context>directory</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTP Server 2.3.0 and later</compatibility>
 
 <usage>
index 23a1ea84100f9411e6e054c8817e510ca7baccad..d5d704183f361801167998e2e5f3bec7adc25445 100644 (file)
@@ -452,6 +452,7 @@ authentication hook.</description>
 <em>option</em> ...</syntax>
 <default>none</default>
 <contextlist><context>directory</context></contextlist>
+<override>FileInfo</override>
 <usage>
     <p>This directive is used to enable a FastCGI authorizer to
     handle a specific processing phase of authentication or
index 57001b9bd0738ad53867091fd040315b5b169b66..7803d4aa5ab2688d1efdd0028c5a094960806309 100644 (file)
@@ -611,6 +611,7 @@ authentication succeeds but authorization fails
 <default>AuthzSendForbiddenOnFailure Off</default>
 <contextlist><context>directory</context><context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache HTTPD 2.3.11 and later</compatibility>
 
 <usage>
index 28cbce302f6d8c084d8cb65abbc5fb15f480eb30..0dfe511070f59eed5aee8b27f8a4813f47307b07 100644 (file)
@@ -392,6 +392,7 @@ CustomLog "logs/deflate_log" deflate
 <default>None, but LimitRequestBody applies after deflation</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
+<override>All</override>
 <compatibility>2.4.10 and later</compatibility>
 
 <usage>
@@ -409,6 +410,7 @@ CustomLog "logs/deflate_log" deflate
 <default>200</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
+<override>All</override>
 <compatibility>2.4.10 and later</compatibility>
 
 <usage>
@@ -429,6 +431,7 @@ CustomLog "logs/deflate_log" deflate
 <default>3</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
+<override>All</override>
 <compatibility>2.4.10 and later</compatibility>
 
 <usage>
index b8d65172b353e37f75994992acfd77431171f9ea..2d500560d58759296f6e222c3bdb44273dc1c587 100644 (file)
@@ -125,6 +125,7 @@ API</description>
 <contextlist><context>server config</context>
 <context>virtual host</context><context>directory</context>
 <context>.htaccess</context></contextlist>
+<override>Options</override>
 
 <usage>
     <p>The <directive>Example</directive> directive just sets a demonstration
index 1f4b7e5de3f669a08a9cebcb2a28b83780dad73e..de9d47a449b01adde94c7bf8e0b2c25c649b40e6 100644 (file)
@@ -854,6 +854,7 @@ H2TLSCoolDownSecs 0
             <context>directory</context>
             <context>.htaccess</context>
         </contextlist>
+        <override>FileInfo</override>
         <compatibility>Available in version 2.4.24 and later.</compatibility>
         
         <usage>
@@ -889,6 +890,7 @@ H2TLSCoolDownSecs 0
             <context>directory</context>
             <context>.htaccess</context>
         </contextlist>
+        <override>FileInfo</override>
         <compatibility>Available in version 2.4.24 and later.</compatibility>
         
         <usage>
index d2bf176d5d43b5cc5bd9f0dceeafc36b85b6edf0..b1fe35b957be9cd55891ee3c97b551cd1d0b224f 100644 (file)
@@ -956,6 +956,7 @@ SSITimeFormat "%R, %B %d, %Y"
 <syntax>SSIETag on|off</syntax>
 <default>SSIETag off</default>
 <contextlist><context>directory</context><context>.htaccess</context></contextlist>
+<override>Limit</override>
 
 <usage>
       <p>Under normal circumstances, a file filtered by <module>mod_include</module>
@@ -996,6 +997,7 @@ server.</description>
 <syntax>SSILastModified on|off</syntax>
 <default>SSILastModified off</default>
 <contextlist><context>directory</context><context>.htaccess</context></contextlist>
+<override>Limit</override>
 
 <usage>
       <p>Under normal circumstances, a file filtered by <module>mod_include</module>
@@ -1034,6 +1036,7 @@ server.</description>
 <syntax>SSILegacyExprParser on|off</syntax>
 <default>SSILegacyExprParser off</default>
 <contextlist><context>directory</context><context>.htaccess</context></contextlist>
+<override>Limit</override>
 <compatibility>Available in version 2.3.13 and later.</compatibility>
 
 <usage>
index b3b57024522f00005ebe55590c38033491144b45..68bd29113bc174ce3507536a947e17be1a8ad512 100644 (file)
@@ -623,6 +623,7 @@ connection client certificate. Not all LDAP toolkits support per
 connection client certificates.</description>
 <syntax>LDAPTrustedClientCert <var>type</var> <var>directory-path/filename/nickname</var> <var>[password]</var></syntax>
 <contextlist><context>directory</context><context>.htaccess</context></contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>It specifies the directory path, file name or nickname of a
index ea50f6df1264c55140925a97286781f6da2dbccb..910a47ee564b4ea2fca8076299a018573288abc9 100644 (file)
@@ -96,6 +96,7 @@
 <default>LogIOTrackTTFB OFF</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
+<override>All</override>
 <compatibility>Apache HTTP Server 2.4.13 and later</compatibility>
 
 <usage>
index fa33c13d8964ed6bdbebe2e4560da97d7b31aeb1..4d30ced7a9a0aa4c3e4f23cc7d9e7c9d712a1cfc 100644 (file)
@@ -1844,6 +1844,7 @@ end
 <description>Provide a Lua function for content input filtering</description>
 <syntax>LuaInputFilter filter_name /path/to/lua/script.lua function_name</syntax>
 <contextlist><context>server config</context> </contextlist>
+<override>All</override>
 <compatibility>2.4.5 and later</compatibility>
 
 <usage>
@@ -1901,6 +1902,7 @@ filters</a>" for more information.
 <description>Provide a Lua function for content output filtering</description>
 <syntax>LuaOutputFilter filter_name /path/to/lua/script.lua function_name</syntax>
 <contextlist><context>server config</context> </contextlist>
+<override>All</override>
 <compatibility>2.4.5 and later</compatibility>
 
 <usage>
index 9a22d5ae3c2371add20a0d3bc70382b27e18ee21..134aa834d05622768ddf1ee2a0f77d3984bf7507 100644 (file)
@@ -196,6 +196,7 @@ UndefMacro DirGroup
 <context>virtual host</context>
 <context>directory</context>
 </contextlist>
+<override>All</override>
 
 <usage>
     <p>The <directive type="section">Macro</directive> directive controls the
@@ -229,6 +230,7 @@ UndefMacro DirGroup
 <context>virtual host</context>
 <context>directory</context>
 </contextlist>
+<override>All</override>
 
 <usage>
     <p>The <directive>Use</directive> directive controls the use of a macro.
@@ -265,6 +267,7 @@ Require ip 192.54.172.0/24 192.54.148.0/24
 <context>virtual host</context>
 <context>directory</context>
 </contextlist>
+<override>All</override>
 
 <usage>
     <p>The <directive>UndefMacro</directive> directive undefines a macro
@@ -288,6 +291,7 @@ UndefMacro RestrictedAccessPolicy
 <context>virtual host</context>
 <context>directory</context>
 </contextlist>
+<override>All</override>
 
 </directivesynopsis>
 
@@ -302,6 +306,7 @@ UndefMacro RestrictedAccessPolicy
 <context>virtual host</context>
 <context>directory</context>
 </contextlist>
+<override>All</override>
 
 </directivesynopsis>
 
index 346c94f47b771573f5dac2752f0c86a74441bb08..f90daee77b1e4ea7aecf1ff03d07832406d5988c 100644 (file)
@@ -85,6 +85,7 @@
 <default>off</default>
 <contextlist><context>server config</context><context>virtual host</context>
   </contextlist>
+<override>FileInfo</override>
 <compatibility>Available in Apache 2.3.13 and later</compatibility>
 
 <usage>
 <default>None</default>
 <contextlist><context>server config</context><context>virtual host</context>
   </contextlist>
+<override>FileInfo</override>
 <compatibility>Available in Apache 2.3.13 and later</compatibility>
 
 <usage>
 <default>"default"</default>
 <contextlist><context>server config</context><context>virtual host</context>
   </contextlist>
+<override>FileInfo</override>
 <compatibility>Available in Apache 2.3.13 and later</compatibility>
 
 <usage>
index 9281d48cf144a128c96e55eea22aaca73c31fb78..3805dfd5596b0a498d3e001efd3951997f014052 100644 (file)
@@ -203,6 +203,7 @@ ProxyPass "/myapp/" "balancer://myappcluster/"
 <contextlist><context>server config</context>
 <context>virtual host</context><context>directory</context>
 <context>.htaccess</context></contextlist>
+<override>FileInfo</override>
 <compatibility>Available in version 2.4.26 and later</compatibility>
 
 <usage>
@@ -233,6 +234,7 @@ scenarios.</p>
 <contextlist><context>server config</context>
 <context>virtual host</context><context>directory</context>
 <context>.htaccess</context></contextlist>
+<override>FileInfo</override>
 <compatibility>Available in version 2.4.26 and later</compatibility>
 
 <usage>
index 72a26d548467a493f826731a83ddc90b54317aac..52e598c366dd0d9cb6e627ac2156f230e18041d0 100644 (file)
@@ -139,6 +139,7 @@ not dynamically checked at all.</p>
 <syntax>ProxyHCExpr name {ap_expr expression}</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
+<override>FileInfo</override>
 
 <usage>
     <p>The <directive>ProxyHCExpr</directive> directive allows
@@ -185,6 +186,7 @@ ProxyPass "/apps"     "http://backend.example.com/" hcexpr=in_maint hcmethod=get
 <syntax>ProxyHCTemplate name parameter=setting &lt;...&gt;</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
+<override>FileInfo</override>
 
 <usage>
     <p>The <directive>ProxyHCTemplate</directive> directive allows
index 3d198b216fbab02527af331ed2bd027ab2cb7f07..e851b3042f5bfe2b36c7be22ae737ea8693c0f7c 100644 (file)
@@ -468,6 +468,7 @@ AuthName "realm"
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionExclude</directive> directive allows sessions to
@@ -498,6 +499,7 @@ the session being updated</description>
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionExpiryUpdateInterval</directive> directive allows
index 39a86b531c75c1b2ead2e819e1086499ab99f95b..5f9bc6a8fca4f84516d50310919470d9c92b3fcc 100644 (file)
@@ -89,6 +89,7 @@ SessionCookieName session path=/
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionCookieName</directive> directive specifies the name and
@@ -121,6 +122,7 @@ SessionCookieName session path=/private;domain=example.com;httponly;secure;versi
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionCookieName2</directive> directive specifies the name and
@@ -153,6 +155,7 @@ SessionCookieName2 session path=/private;domain=example.com;httponly;secure;vers
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionCookieRemove</directive> flag controls whether the cookies
index dd8e7da98f28831e01f1627326c59dbf8d6afe09..a7d9454a09111eec65b316325877a23f60474c32 100644 (file)
@@ -158,6 +158,7 @@ SessionCryptoPassphrase secret
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache 2.3.0 and later</compatibility>
 
 <usage>
@@ -232,6 +233,7 @@ SessionCryptoPassphrase "exec:/path/to/otherProgram argument1"
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 <compatibility>Available in Apache 2.3.0 and later</compatibility>
 
 <usage>
index adc5ba2ebd73740ad885584516e2fc704673732a..4105654dcefb252710afa734c813e6328820383c 100644 (file)
@@ -160,6 +160,7 @@ SessionDBDPerUser On
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionDBDCookieName</directive> directive specifies the name and
@@ -192,6 +193,7 @@ SessionDBDCookieName session path=/private;domain=example.com;httponly;secure;ve
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionDBDCookieName2</directive> directive specifies the name and
@@ -224,6 +226,7 @@ SessionDBDCookieName2 session path=/private;domain=example.com;httponly;secure;v
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionDBDCookieRemove</directive> flag controls whether the cookies
@@ -247,6 +250,7 @@ SessionDBDCookieName2 session path=/private;domain=example.com;httponly;secure;v
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionDBDPerUser</directive> flag enables a per user session keyed
@@ -266,6 +270,7 @@ SessionDBDCookieName2 session path=/private;domain=example.com;httponly;secure;v
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionDBDSelectLabel</directive> directive sets the default select
@@ -285,6 +290,7 @@ SessionDBDCookieName2 session path=/private;domain=example.com;httponly;secure;v
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionDBDInsertLabel</directive> directive sets the default insert
@@ -307,6 +313,7 @@ SessionDBDCookieName2 session path=/private;domain=example.com;httponly;secure;v
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionDBDUpdateLabel</directive> directive sets the default update
@@ -330,6 +337,7 @@ SessionDBDCookieName2 session path=/private;domain=example.com;httponly;secure;v
 <context>directory</context>
 <context>.htaccess</context>
 </contextlist>
+<override>AuthConfig</override>
 
 <usage>
     <p>The <directive>SessionDBDDeleteLabel</directive> directive sets the default delete
index ef5b30af8e1d595c4d029dd91e66c04cb72873da..af29963c46335c13e742346686275b78742f96a0 100644 (file)
@@ -1030,6 +1030,7 @@ Client Auth</description>
 <syntax>SSLCACertificatePath <em>directory-path</em></syntax>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
+<override>AuthConfig</override>
 
 <usage>
 <p>
@@ -1057,6 +1058,7 @@ for Client Auth</description>
 <syntax>SSLCACertificateFile <em>file-path</em></syntax>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
+<override>AuthConfig</override>
 
 <usage>
 <p>
index 9393466511e8d9bd78ee6dc86aa42cf99dbf4d99..b88bf5f3d82e51a53ba52a37bf10a8b8448c15f0 100644 (file)
@@ -125,6 +125,7 @@ can be <a href="#sniffing">automatically detected</a></description>
 <contextlist><context>server config</context>
 <context>virtual host</context><context>directory</context>
 <context>.htaccess</context></contextlist>
+<override>All</override>
 <compatibility>Version 2.4.0 and later; available as a third-party
 module for earlier versions.</compatibility>
 
@@ -161,6 +162,7 @@ xml2EncDefault iso-8859-1
 <syntax>xml2StartParse <var>element [element ...]</var></syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
+<override>All</override>
 
 <usage>
     <p>Specify that the markup parser should start at the first instance