luehe 2003/07/30 17:19:42
Modified: catalina/src/share/org/apache/coyote/tomcat5
CoyoteConnector.java mbeans-descriptors.xml
Log:
Added new "sslProtocol" property + minor javadoc edits
The "protocol" property is a little confusing, as it means different
things in different classes:
- In CoyoteConnector, it refers to the Coyote protocol name (i.e.,
HTTP/1.1 or AJP/1.3).
- In Http11Processor and CoyoteServerSocketFactory, it refers to the
SSL protocol variant.
We may want to fix this.
Revision Changes Path
1.18 +32 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CoyoteConnector.java 29 Jul 2003 16:29:57 -0000 1.17
+++ CoyoteConnector.java 31 Jul 2003 00:19:42 -0000 1.18
@@ -819,10 +819,9 @@
/**
- * Set the Coyote protocol which will be used
- * by the connector.
+ * Set the Coyote protocol which will be used by the connector.
*
- * @param protocolHandlerClassName The new class name
+ * @param protocol The Coyote protocol name
*/
public void setProtocol(String protocol) {
@@ -1317,9 +1316,11 @@
IntrospectionUtils.setProperty(protocolHandler, "secure",
"" + false);
}
+
/* Set the configured properties. This only sets the ones that were
- explicitly configured. Default values are the responsibility of
- the protocolHandler. */
+ * explicitly configured. Default values are the responsibility of
+ * the protocolHandler.
+ */
Iterator keys = properties.keySet().iterator();
while( keys.hasNext() ) {
String name = (String)keys.next();
@@ -1519,6 +1520,31 @@
ServerSocketFactory factory = getFactory();
if (factory instanceof CoyoteServerSocketFactory) {
((CoyoteServerSocketFactory)factory).setCiphers(ciphers);
+ }
+ }
+
+ /**
+ * Gets the SSL protocol variant to be used.
+ *
+ * @return SSL protocol variant
+ */
+ public String getSslProtocol() {
+ ServerSocketFactory factory = getFactory();
+ if (factory instanceof CoyoteServerSocketFactory) {
+ return ((CoyoteServerSocketFactory)factory).getProtocol();
+ }
+ return null;
+ }
+
+ /**
+ * Sets the SSL protocol variant to be used.
+ *
+ * @param sslProtocol SSL protocol variant
+ */
+ public void setSslProtocol(String sslProtocol) {
+ ServerSocketFactory factory = getFactory();
+ if (factory instanceof CoyoteServerSocketFactory) {
+ ((CoyoteServerSocketFactory)factory).setProtocol(sslProtocol);
}
}
1.3 +4 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbeans-descriptors.xml 11 Jul 2003 01:04:43 -0000 1.2
+++ mbeans-descriptors.xml 31 Jul 2003 00:19:42 -0000 1.3
@@ -32,6 +32,10 @@
description="Comma-separated list of SSL cipher suites to be enabled"
type="java.lang.String"/>
+ <attribute name="sslProtocol"
+ description="SSL protocol variant to be used"
+ type="java.lang.String"/>
+
<attribute name="connectionTimeout"
description="Timeout value on the incoming connection"
type="int"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
