remm 02/04/16 16:45:14
Modified: coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
Log:
- Tweak the value of the "secure" and the "clientauth" attributes, to make the
SSL configuration identical to what it was before.
Revision Changes Path
1.9 +18 -11
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoyoteConnector.java 10 Apr 2002 23:50:33 -0000 1.8
+++ CoyoteConnector.java 16 Apr 2002 23:45:14 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
1.8 2002/04/10 23:50:33 costin Exp $
- * $Revision: 1.8 $
- * $Date: 2002/04/10 23:50:33 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
1.9 2002/04/16 23:45:14 remm Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/04/16 23:45:14 $
*
* ====================================================================
*
@@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.8 $ $Date: 2002/04/10 23:50:33 $
+ * @version $Revision: 1.9 $ $Date: 2002/04/16 23:45:14 $
*/
@@ -945,7 +945,9 @@
}
protocolHandler.setAdapter(adapter);
- IntrospectionUtils.setProperty(protocolHandler, "jkHome",
System.getProperty("catalina.base"));
+ IntrospectionUtils.setProperty(protocolHandler, "jkHome",
+ System.getProperty("catalina.base"));
+
// Set attributes
IntrospectionUtils.setProperty(protocolHandler, "port", "" + port);
IntrospectionUtils.setProperty(protocolHandler, "maxThreads",
@@ -957,16 +959,18 @@
IntrospectionUtils.setProperty(protocolHandler, "soTimeout",
"" + connectionTimeout);
- IntrospectionUtils.setProperty(protocolHandler, "secure",
- "" + secure);
-
// Configure secure socket factory
if (factory instanceof CoyoteServerSocketFactory) {
- CoyoteServerSocketFactory ssf = (CoyoteServerSocketFactory) factory;
+ IntrospectionUtils.setProperty(protocolHandler, "secure",
+ "" + true);
+ CoyoteServerSocketFactory ssf =
+ (CoyoteServerSocketFactory) factory;
IntrospectionUtils.setProperty(protocolHandler, "algorithm",
ssf.getAlgorithm());
- IntrospectionUtils.setProperty(protocolHandler, "clientauth",
- "" + ssf.getClientAuth());
+ if (ssf.getClientAuth()) {
+ IntrospectionUtils.setProperty(protocolHandler, "clientauth",
+ "" + ssf.getClientAuth());
+ }
IntrospectionUtils.setProperty(protocolHandler, "keystore",
ssf.getKeystoreFile());
IntrospectionUtils.setProperty(protocolHandler, "keypass",
@@ -980,6 +984,9 @@
ssf.getSSLImplementation());
IntrospectionUtils.setProperty(protocolHandler, "socketFactory",
ssf.getSocketFactoryName());
+ } else {
+ IntrospectionUtils.setProperty(protocolHandler, "secure",
+ "" + false);
}
try {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
