Return-Path: 
 <cvs-return-53451-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9403B17813
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Wed, 22 Apr 2015 17:26:46 +0000 (UTC)
Received: (qmail 39947 invoked by uid 500); 22 Apr 2015 17:26:46 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 39875 invoked by uid 500); 22 Apr 2015 17:26:46 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 39866 invoked by uid 99); 22 Apr 2015 17:26:46 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 17:26:46 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 55F0AAC0027
	for <cvs@httpd.apache.org>; Wed, 22 Apr 2015 17:26:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1675432 - in
 /httpd/httpd/branches/2.4.x/docs/manual/mod:
 core.xml mod_mime.xml
Date: Wed, 22 Apr 2015 17:26:46 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150422172646.55F0AAC0027@hades.apache.org>

Author: covener
Date: Wed Apr 22 17:26:46 2015
New Revision: 1675432

URL: http://svn.apache.org/r1675432
Log:
Merge r1675426, r1675429 from trunk:

PR57778

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



typoes


Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_mime.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml?rev=1675432&r1=1675431&r2=1675432&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml Wed Apr 22 17:26:46 2015
@@ -1856,6 +1856,20 @@ media type in the HTTP Content-Type head
     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>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_mime.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_mime.xml?rev=1675432&r1=1675431&r2=1675432&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_mime.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_mime.xml Wed Apr 22 17:26:46 2015
@@ -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>