Author: markt
Date: Wed Jul 30 10:54:23 2008
New Revision: 681146

URL: http://svn.apache.org/viewvc?rev=681146&view=rev
Log:
Fix for bug 44715. Document use of secret for AJP connector.

Modified:
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml
    tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681146&r1=681145&r2=681146&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 10:54:23 2008
@@ -69,6 +69,9 @@
         <bug>44541</bug>: Document packetSize attribute for AJP connector.
         (markt)
       </fix>
+      <fix>
+        <bug>44715</bug>: Document use of secret for AJP connector. (markt)
+      </fix>
       <update>
         <bug>45323</bug>: Add note that context.xml files can only contain a
         single Context element. (markt)

Modified: tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml?rev=681146&r1=681145&r2=681146&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/ajp.xml Wed Jul 30 10:54:23 
2008
@@ -292,6 +292,25 @@
       to a particular port number on a particular IP address.</p>
     </attribute>
 
+    <attribute name="request.secret" required="false">
+      <p>Only requests from workers with this secret keyword will be accepted.
+      </p>
+    </attribute>
+
+    <attribute name="request.shutdownEnabled" required="false">
+      <p>If true and a secret has been configured, a correctly fomatted AJP
+      request (that includes the secret) will shutdown the Tomcat instance
+      associated with this connector. This is set to <code>false</code> by
+      default.</p>
+    </attribute>
+
+    <attribute name="request.useSecret" required="false">
+      <p>If set to <code>true</code>, then a random value for
+      <code>request.secret</code> will be generated. It is for use with
+      <code>request.shutdownEnabled</code>. This is set to <code>false</code>
+      by default.</p>
+    </attribute>
+
     <attribute name="tcpNoDelay" required="false">
       <p>If set to <code>true</code>, the TCP_NO_DELAY option will be
       set on the server socket, which improves performance under most

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681146&r1=681145&r2=681146&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 10:54:23 2008
@@ -51,12 +51,6 @@
   +1: markt
   -1: fhanik - difficult to review "cleaned up" code, rainers backports 
doesn't have that, lets review those
 
-* Document missing secret attributes
-  https://issues.apache.org/bugzilla/show_bug.cgi?id=44715
-  http://svn.apache.org/viewvc?rev=643497&view=rev
-  +1: mark, fhanik,yoavs
-  -1:
-
 * Final fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
   With these patches the test case provided in the bug report
   passes for multibyte and single bytes tests including the edge



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to