From: Eric Covener <covener@apache.org>
Date: Fri, 5 Nov 2010 19:23:34 +0000 (+0000)
Subject: Merge r1031731 from trunk:
X-Git-Tag: 2.2.18~314
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1933985f7454b41e64d0137bddf6d6fbdb1af27f;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1031731 from trunk:

PR#40047: explain that AJP_* variables can be used to send atrributes to the backend, like JkEnvVar.



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

diff --git a/docs/manual/mod/mod_proxy_ajp.html.en b/docs/manual/mod/mod_proxy_ajp.html.en
index daf45e43c75..9997ee03b34 100644
--- a/docs/manual/mod/mod_proxy_ajp.html.en
+++ b/docs/manual/mod/mod_proxy_ajp.html.en
@@ -51,6 +51,7 @@
             directives.</p>
 <h3>Topics</h3>
 <ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#env">Environment Variables</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#overviewprotocol">Overview of the protocol</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#basppacketstruct">Basic Packet Structure</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#rpacetstruct">Request Packet Structure</a></li>
@@ -58,9 +59,16 @@
 </ul><h3>See also</h3>
 <ul class="seealso">
 <li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
+<li><a href="../env.html">Environment Variable documentation</a></li>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
+<h2><a name="env" id="env">Environment Variables</a></h2>
+    <p>Environment variables whose names have the prefix <code>AJP_</code> 
+    are forwarded to the origin server as AJP request attributes 
+    (with the AJP_ prefix removed from the name of the key).</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
 <h2><a name="overviewprotocol" id="overviewprotocol">Overview of the protocol</a></h2>
     <p>The <code>AJP13</code> protocol is packet-oriented.  A binary format
     was presumably chosen over the more readable plain text for reasons of
diff --git a/docs/manual/mod/mod_proxy_ajp.xml b/docs/manual/mod/mod_proxy_ajp.xml
index dad95bac438..9b3eae30cc3 100644
--- a/docs/manual/mod/mod_proxy_ajp.xml
+++ b/docs/manual/mod/mod_proxy_ajp.xml
@@ -49,6 +49,13 @@
 </summary>
 
 <seealso><module>mod_proxy</module></seealso>
+<seealso><a href="../env.html">Environment Variable documentation</a></seealso>
+
+<section id="env"><title>Environment Variables</title>
+    <p>Environment variables whose names have the prefix <code>AJP_</code> 
+    are forwarded to the origin server as AJP request attributes 
+    (with the AJP_ prefix removed from the name of the key).</p>
+</section>
 
 <section id="overviewprotocol"><title>Overview of the protocol</title>
     <p>The <code>AJP13</code> protocol is packet-oriented.  A binary format