svn commit: r831106 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11NioProtocol.java Http11Protocol.java

[fhanik]

Author: fhanik
Date: Thu Oct 29 21:48:04 2009
New Revision: 831106

URL: http://svn.apache.org/viewvc?rev=831106&view=rev
Log:
SSL should be based on SSLEnabled, not secure flag

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=831106&r1=831105&r2=831106&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu Oct 
29 21:48:04 2009
@@ -734,7 +734,7 @@
 
                 processor.action(ActionCode.ACTION_START, null);
                 
-                if (proto.ep.getSecure() && (proto.sslImplementation != null)) 
{
+                if (proto.ep.isSSLEnabled() && (proto.sslImplementation != 
null)) {
                     if (socket instanceof SecureNioChannel) {
                         SecureNioChannel ch = (SecureNioChannel)socket;
                         
processor.setSslSupport(proto.sslImplementation.getSSLSupport(ch.getSslEngine().getSession()));

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=831106&r1=831105&r2=831106&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Thu Oct 29 
21:48:04 2009
@@ -578,7 +578,7 @@
 
                 processor.action(ActionCode.ACTION_START, null);
 
-                if (proto.secure && (proto.sslImplementation != null)) {
+                if (proto.isSSLEnabled() && (proto.sslImplementation != null)) 
{
                     processor.setSSLSupport
                         
(proto.sslImplementation.getSSLSupport(socket.getSocket()));
                 } else {



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