Merge r1675426, r1675429 from trunk:

PR57778

document legacy AddType/ForceType magic types as Handler names
for the curious.

typoes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1675432 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 838e0d4c06112c2023c414428d8c8500aa8ca123..4bdd10ee4fabf4eda0e6d7c6fe625f45d1583dba 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1856,6 +1856,20 @@ media type in the HTTP Content-Type header field</description>
     static files, where the generator of the response typically specifies
     a Content-Type, this directive has no effect.</p>
 
+    <note><title>Note</title>
+    <p>When explicit directives such as
+    <directive module="core" >SetHandler</directive> or
+    <directive module="mod_mime">AddHandler</directive> do not apply
+    to the current request, the internal handler name normally set by those
+    directives is set to match the content type specified by this directive.
+    This is a historical behavior that some third-party modules
+    (such as mod_php) may use "magic" content types used only to signal the
+    module to take responsibility for the matching request.  Configurations
+    that rely on such "magic" types should be avoided by the use of
+    <directive module="core" >SetHandler</directive> or
+    <directive module="mod_mime">AddHandler</directive>. </p>
+    </note>
+
 </usage>
 </directivesynopsis>
 <directivesynopsis>

diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml
index a05589279a23affc313f92e67adf96a04ff9439c..cf93dc2462060be5503d380a752658fcf95307c6 100644 (file)
--- a/docs/manual/mod/mod_mime.xml
+++ b/docs/manual/mod/mod_mime.xml
@@ -606,6 +606,21 @@ type</description>
     static files, where the generator of the response typically specifies
     a Content-Type, this directive has no effect.</p>
 
+
+    <note><title>Note</title>
+    <p>When explicit directives such as 
+    <directive module="core" >SetHandler</directive> or 
+    <directive module="mod_mime">AddHandler</directive> do not apply 
+    to the current request, the internal handler name normally set by those
+    directives is set to match the content type specified by this directive.  
+    This is a historical behavior that some third-party modules 
+    (such as mod_php) may use "magic" content types used only to signal the 
+    module to take responsibility for the matching request.  Configurations
+    that rely on such "magic" types should be avoided by the use of 
+    <directive module="core" >SetHandler</directive> or 
+    <directive module="mod_mime">AddHandler</directive>. </p>
+    </note>
+
 </usage>
 <seealso><directive module="core">ForceType</directive></seealso>
 <seealso><module>mod_negotiation</module></seealso>