You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2007/05/01 10:39:19 UTC

svn commit: r533965 - in /httpd/httpd/branches/2.2.x/docs/manual/mod: mod_proxy_ajp.html.en mod_proxy_ajp.xml

Author: rpluem
Date: Tue May  1 01:39:18 2007
New Revision: 533965

URL: http://svn.apache.org/viewvc?view=rev&rev=533965
Log:
Merge r409442 from trunk:

* Fix documentation about the data types of attributes in the AJP protocol.

PR: 39658

Submitted by: rpluem

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.html.en?view=diff&rev=533965&r1=533964&r2=533965
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.html.en Tue May  1 01:39:18 2007
@@ -416,28 +416,28 @@
   <h3>Attributes</h3>
     <p>The attributes prefixed with a <code>?</code>
     (e.g. <code>?context</code>) are all optional.  For each, there is a
-    single byte code to indicate the type of attribute, and then a string to
-    give its value.  They can be sent in any order (thogh the C code always
-    sends them in the order listed below).  A special terminating code is
-    sent to signal the end of the list of optional attributes. The list of
+    single byte code to indicate the type of attribute, and then its value
+    (string or integer).  They can be sent in any order (though the C code
+    always sends them in the order listed below).  A special terminating code
+    is sent to signal the end of the list of optional attributes. The list of
     byte codes is:</p>
     <table>
-      <tr><td>Information</td><td>Code Value</td><td>Note</td></tr>
-      <tr><td>?context</td><td>0x01</td><td>Not currently implemented
+      <tr><td>Information</td><td>Code Value</td><td>Type Of Value</td><td>Note</td></tr>
+      <tr><td>?context</td><td>0x01</td><td>-</td><td>Not currently implemented
       </td></tr>
-      <tr><td>?servlet_path</td><td>0x02</td><td>Not currently implemented
+      <tr><td>?servlet_path</td><td>0x02</td><td>-</td><td>Not currently implemented
       </td></tr>
-      <tr><td>?remote_user</td><td>0x03</td><td /></tr>
-      <tr><td>?auth_type</td><td>0x04</td><td /></tr>
-      <tr><td>?query_string</td><td>0x05</td><td /></tr>
-      <tr><td>?jvm_route</td><td>0x06</td><td /></tr>
-      <tr><td>?ssl_cert</td><td>0x07</td><td /></tr>
-      <tr><td>?ssl_cipher</td><td>0x08</td><td /></tr>
-      <tr><td>?ssl_session</td><td>0x09</td><td /></tr>
-      <tr><td>?req_attribute</td><td>0x0A</td><td>Name (the name of the
+      <tr><td>?remote_user</td><td>0x03</td><td>String</td><td /></tr>
+      <tr><td>?auth_type</td><td>0x04</td><td>String</td><td /></tr>
+      <tr><td>?query_string</td><td>0x05</td><td>String</td><td /></tr>
+      <tr><td>?jvm_route</td><td>0x06</td><td>String</td><td /></tr>
+      <tr><td>?ssl_cert</td><td>0x07</td><td>String</td><td /></tr>
+      <tr><td>?ssl_cipher</td><td>0x08</td><td>String</td><td /></tr>
+      <tr><td>?ssl_session</td><td>0x09</td><td>String</td><td /></tr>
+      <tr><td>?req_attribute</td><td>0x0A</td><td>String</td><td>Name (the name of the
       attribute follows)</td></tr>
-      <tr><td>?ssl_key_size</td><td>0x0B</td><td /></tr>
-      <tr><td>are_done</td><td>0xFF</td><td>request_terminator</td></tr>
+      <tr><td>?ssl_key_size</td><td>0x0B</td><td>Integer</td><td /></tr>
+      <tr><td>are_done</td><td>0xFF</td><td>-</td><td>request_terminator</td></tr>
     </table>
     <p>The <code>context</code> and <code>servlet_path</code> are not
     currently set by the C code, and most of the Java code completely ignores

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.xml?view=diff&rev=533965&r1=533964&r2=533965
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.xml Tue May  1 01:39:18 2007
@@ -404,28 +404,28 @@
   <section><title>Attributes</title>
     <p>The attributes prefixed with a <code>?</code>
     (e.g. <code>?context</code>) are all optional.  For each, there is a
-    single byte code to indicate the type of attribute, and then a string to
-    give its value.  They can be sent in any order (thogh the C code always
-    sends them in the order listed below).  A special terminating code is
-    sent to signal the end of the list of optional attributes. The list of
+    single byte code to indicate the type of attribute, and then its value
+    (string or integer).  They can be sent in any order (though the C code
+    always sends them in the order listed below).  A special terminating code
+    is sent to signal the end of the list of optional attributes. The list of
     byte codes is:</p>
     <table>
-      <tr><td>Information</td><td>Code Value</td><td>Note</td></tr>
-      <tr><td>?context</td><td>0x01</td><td>Not currently implemented
+      <tr><td>Information</td><td>Code Value</td><td>Type Of Value</td><td>Note</td></tr>
+      <tr><td>?context</td><td>0x01</td><td>-</td><td>Not currently implemented
       </td></tr>
-      <tr><td>?servlet_path</td><td>0x02</td><td>Not currently implemented
+      <tr><td>?servlet_path</td><td>0x02</td><td>-</td><td>Not currently implemented
       </td></tr>
-      <tr><td>?remote_user</td><td>0x03</td><td></td></tr>
-      <tr><td>?auth_type</td><td>0x04</td><td></td></tr>
-      <tr><td>?query_string</td><td>0x05</td><td></td></tr>
-      <tr><td>?jvm_route</td><td>0x06</td><td></td></tr>
-      <tr><td>?ssl_cert</td><td>0x07</td><td></td></tr>
-      <tr><td>?ssl_cipher</td><td>0x08</td><td></td></tr>
-      <tr><td>?ssl_session</td><td>0x09</td><td></td></tr>
-      <tr><td>?req_attribute</td><td>0x0A</td><td>Name (the name of the
+      <tr><td>?remote_user</td><td>0x03</td><td>String</td><td></td></tr>
+      <tr><td>?auth_type</td><td>0x04</td><td>String</td><td></td></tr>
+      <tr><td>?query_string</td><td>0x05</td><td>String</td><td></td></tr>
+      <tr><td>?jvm_route</td><td>0x06</td><td>String</td><td></td></tr>
+      <tr><td>?ssl_cert</td><td>0x07</td><td>String</td><td></td></tr>
+      <tr><td>?ssl_cipher</td><td>0x08</td><td>String</td><td></td></tr>
+      <tr><td>?ssl_session</td><td>0x09</td><td>String</td><td></td></tr>
+      <tr><td>?req_attribute</td><td>0x0A</td><td>String</td><td>Name (the name of the
       attribute follows)</td></tr>
-      <tr><td>?ssl_key_size</td><td>0x0B</td><td></td></tr>
-      <tr><td>are_done</td><td>0xFF</td><td>request_terminator</td></tr>
+      <tr><td>?ssl_key_size</td><td>0x0B</td><td>Integer</td><td></td></tr>
+      <tr><td>are_done</td><td>0xFF</td><td>-</td><td>request_terminator</td></tr>
     </table>
     <p>The <code>context</code> and <code>servlet_path</code> are not
     currently set by the C code, and most of the Java code completely ignores