Author: kkolinko
Date: Wed Nov 26 00:01:36 2014
New Revision: 1641728
URL: http://svn.apache.org/r1641728
Log:
Add /sslConnectorCiphers to the list of commands in ManagerServlet javadoc.
Merged r1641720 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1641720
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1641728&r1=1641727&r2=1641728&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Wed Nov 26 00:01:36 2014
@@ -108,6 +108,8 @@ import org.apache.tomcat.util.res.String
* <li><b>/expire?path=/xxx&idle=mm</b> - Expire sessions
* for the context path <code>/xxx</code> which were idle for at
* least mm minutes.</li>
+ * <li><b>/sslConnectorCiphers</b> - Display diagnostic info on SSL/TLS ciphers
+ * that are currently configured for each connector.
* <li><b>/start?path=/xxx</b> - Start the web application attached to
* context path <code>/xxx</code> for this virtual host.</li>
* <li><b>/stop?path=/xxx</b> - Stop the web application attached to
Modified: tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml?rev=1641728&r1=1641727&r2=1641728&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/manager-howto.xml Wed Nov 26 00:01:36 2014
@@ -836,15 +836,15 @@ has been reloaded several times, it may
</subsection>
-<subsection name="Connector SSL diagnostics">
+<subsection name="Connector SSL/TLS diagnostics">
<source>http://localhost:8080/manager/text/sslConnectorCiphers</source>
-<p>The SSL Connector/Ciphers diagnostic lists the SSL ciphers that are
currently
+<p>The SSL Connector/Ciphers diagnostic lists the SSL/TLS ciphers that are
currently
configured for each connector. For BIO and NIO, the names of the individual
cipher suites are listed. For APR, the value of SSLCipherSuite is returned.</p>
-<p>The response will ook something like this:</p>
+<p>The response will look something like this:</p>
<source>OK - Connector / SSL Cipher information
Connector[HTTP/1.1-8080]
SSL is not enabled for this connector
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
