From: Eric Covener <covener@apache.org>
Date: Wed, 22 Apr 2015 17:26:46 +0000 (+0000)
Subject: Merge r1675426, r1675429 from trunk:
X-Git-Tag: 2.4.13~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60e6546ba044b36a8d70d1e5e8ae0f1d6cf18622;p=thirdparty%2Fapache%2Fhttpd.git

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 838e0d4c061..4bdd10ee4fa 100644
--- 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 a05589279a2..cf93dc24620 100644
--- 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>