backport 946616 and 946617 from trunk:

  PR49308: Header directive doesn't see CGI-issued headers because they live in err_headers.
  emphasize request/response in the timing description, easy to miss the significance

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

diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index 42eb811617b6eb82ab83c52f797545cc1358c93d..a2b068afbf8837b2a402854c24232599005da4af 100644 (file)
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -70,8 +70,8 @@ headers</td></tr>
 <div class="section">
 <h2><a name="early" id="early">Early and Late Processing</a></h2>
     <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> can be applied either early or late
-    in the request.  The normal mode is late, when Request Headers are
-    set immediately before running the content generator and Response
+    in the request.  The normal mode is late, when <em>Request</em> Headers are
+    set immediately before running the content generator and <em>Response</em>
     Headers just as the response is sent down the wire.  Always use
     Late mode in an operational server.</p>
 
@@ -222,6 +222,11 @@ headers</td></tr>
     successful responses, and is always needed to affect non-<code>2<var>xx</var></code> 
     responses such as redirects or client errors.</p>
 
+    <div class="note"><h3>CGI</h3>
+      <p>To manipulate headers set by CGI scripts, it is necessary to specify 
+      <code>always</code> for the first parameter.</p>
+    </div>
+
     <p>The action it performs is determined by the first
     argument (second argument if a <var>condition</var> is specified).
     This can be one of the following values:</p>

diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index bef45ae4ddd9c32e416d3cf451e262e395161113..2d94333abfa02348c8a5580b86ab52144c73c649 100644 (file)
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -58,8 +58,8 @@ headers</description>
 
 <section id="early"><title>Early and Late Processing</title>
     <p><module>mod_headers</module> can be applied either early or late
-    in the request.  The normal mode is late, when Request Headers are
-    set immediately before running the content generator and Response
+    in the request.  The normal mode is late, when <em>Request</em> Headers are
+    set immediately before running the content generator and <em>Response</em>
     Headers just as the response is sent down the wire.  Always use
     Late mode in an operational server.</p>
 
@@ -306,6 +306,11 @@ headers</description>
     successful responses, and is always needed to affect non-<code>2<var>xx</var></code> 
     responses such as redirects or client errors.</p>
 
+    <note><title>CGI</title>
+      <p>To manipulate headers set by CGI scripts, it is necessary to specify 
+      <code>always</code> for the first parameter.</p>
+    </note>
+
     <p>The action it performs is determined by the first
     argument (second argument if a <var>condition</var> is specified).
     This can be one of the following values:</p>