remm 2004/12/06 05:59:28 Modified: catalina/src/share/org/apache/catalina/connector Connector.java http11/src/java/org/apache/coyote/http11 Http11Protocol.java Log: - Decouple usage of the scheme and secure attributes from enabling SSL. - I think this was the case sometime in the past, and IMO it could be useful if the SSL stuff is done outside of Tomcat (where the connector on Tomcat would be a "fake" SSL connector). - Hopefully I'm not doing anything too stupid ... Revision Changes Path 1.15 +1 -3 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java Index: Connector.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Connector.java 13 Oct 2004 08:17:47 -0000 1.14 +++ Connector.java 6 Dec 2004 13:59:28 -0000 1.15 @@ -708,7 +708,6 @@ public void setScheme(String scheme) { this.scheme = scheme; - setProperty("scheme", scheme); } @@ -733,7 +732,6 @@ public void setSecure(boolean secure) { this.secure = secure; - setProperty("secure", String.valueOf(secure)); } 1.61 +2 -0 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java Index: Http11Protocol.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- Http11Protocol.java 11 Nov 2004 14:54:20 -0000 1.60 +++ Http11Protocol.java 6 Dec 2004 13:59:28 -0000 1.61 @@ -351,6 +351,7 @@ public void setSSLImplementation( String valueS) { sslImplementationName = valueS; + setSecure(true); setAttribute("sslImplementation", valueS); } @@ -507,6 +508,7 @@ } public void setProtocol( String k ) { + setSecure(true); setAttribute("protocol", k); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]