From: Vincent Bray <noodl@apache.org>
Date: Mon, 23 Jul 2007 15:05:00 +0000 (+0000)
Subject: Backport r558718 to 2.2 [Demote use of AddType for cgi and remove redundant paragraph... 
X-Git-Tag: 2.2.5~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64ae46a7b118c399676df2f5bff8d58ad26a80a0;p=thirdparty%2Fapache%2Fhttpd.git

Backport r558718 to 2.2 [Demote use of AddType for cgi and remove redundant paragraph regarding DOCUMENT_ROOT]

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

diff --git a/docs/manual/mod/mod_cgi.html.en b/docs/manual/mod/mod_cgi.html.en
index f51f5964aa3..27e5c11d133 100644
--- a/docs/manual/mod/mod_cgi.html.en
+++ b/docs/manual/mod/mod_cgi.html.en
@@ -33,22 +33,15 @@
 
     
 
-    <p>Any file that has the mime type
-    <code>application/x-httpd-cgi</code> or handler
-    <code>cgi-script</code> (Apache 1.1 or later) will be treated
+    <p>Any file that has the handler
+    <code>cgi-script</code> will be treated
     as a CGI script, and run by the server, with its output being
-    returned to the client. Files acquire this type either by
+    returned to the client. Files acquire this handler either by
     having a name containing an extension defined by the
-    <code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code> directive, or by being
+    <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> directive, or by being
     in a <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
     directory.</p>
 
-    <p>When the server invokes a CGI script, it will add a variable
-    called <code>DOCUMENT_ROOT</code> to the environment. This
-    variable will contain the value of the
-    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> configuration
-    variable.</p>
-
     <p>For an introduction to using CGI scripts with Apache, see
     our tutorial on <a href="../howto/cgi.html">Dynamic Content
     With CGI</a>.</p>
@@ -57,6 +50,10 @@
     <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> should be used in place of
     this module. At the user level, the two modules are essentially
     identical.</p>
+    
+    <p>For backward-compatibility, the cgi-script handler will also be activated
+    for any file with the mime-type <code>application/x-httpd-cgi</code>. The
+    use of the magic mime-type is deprecated.</p>
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <ul id="toc">
diff --git a/docs/manual/mod/mod_cgi.xml b/docs/manual/mod/mod_cgi.xml
index 4c0a98f1ce6..029d1c0484c 100644
--- a/docs/manual/mod/mod_cgi.xml
+++ b/docs/manual/mod/mod_cgi.xml
@@ -33,22 +33,15 @@
           is the link to howto/cgi not sufficient? -nd
     -->
 
-    <p>Any file that has the mime type
-    <code>application/x-httpd-cgi</code> or handler
-    <code>cgi-script</code> (Apache 1.1 or later) will be treated
+    <p>Any file that has the handler
+    <code>cgi-script</code> will be treated
     as a CGI script, and run by the server, with its output being
-    returned to the client. Files acquire this type either by
+    returned to the client. Files acquire this handler either by
     having a name containing an extension defined by the
-    <directive module="mod_mime">AddType</directive> directive, or by being
+    <directive module="mod_mime">AddHandler</directive> directive, or by being
     in a <directive module="mod_alias">ScriptAlias</directive>
     directory.</p>
 
-    <p>When the server invokes a CGI script, it will add a variable
-    called <code>DOCUMENT_ROOT</code> to the environment. This
-    variable will contain the value of the
-    <directive module="core">DocumentRoot</directive> configuration
-    variable.</p>
-
     <p>For an introduction to using CGI scripts with Apache, see
     our tutorial on <a href="../howto/cgi.html">Dynamic Content
     With CGI</a>.</p>
@@ -57,6 +50,10 @@
     <module>mod_cgid</module> should be used in place of
     this module. At the user level, the two modules are essentially
     identical.</p>
+    
+    <p>For backward-compatibility, the cgi-script handler will also be activated
+    for any file with the mime-type <code>application/x-httpd-cgi</code>. The
+    use of the magic mime-type is deprecated.</p>
 </summary>
 
 <seealso><directive module="core">AcceptPathInfo</directive></seealso>