You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/04/15 19:15:16 UTC

svn commit: r648340 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/docs/changelog.xml webapps/docs/config/ajp.xml

Author: markt
Date: Tue Apr 15 10:15:09 2008
New Revision: 648340

URL: http://svn.apache.org/viewvc?rev=648340&view=rev
Log:
Fix bug 44715. Document secret attributes.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648340&r1=648339&r2=648340&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Apr 15 10:15:09 2008
@@ -60,12 +60,6 @@
   +1: markt, fhanik
   -1: 
 
-* 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, pero
-  -1:
-
 * Fix NIO/Sendfile problem
   http://svn.apache.org/viewvc?rev=644858&view=rev
   http://svn.apache.org/viewvc?rev=644860&view=rev

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=648340&r1=648339&r2=648340&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Apr 15 10:15:09 2008
@@ -133,6 +133,9 @@
         <bug>44541</bug>: Document packetSize attribute for AJP connector.
         (markt)
       </fix>
+      <fix>
+        <bug>44715</bug>: Document secret attribute for AJP connector. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Cluster">

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml?rev=648340&r1=648339&r2=648340&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml Tue Apr 15 10:15:09 2008
@@ -274,6 +274,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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org