SSL should be based on SSLEnabled, not secure flag

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@831106 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 1121f00..9246e5f 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -734,7 +734,7 @@ public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration
 
                 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()));

diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java
index a6ee796..0ed13e0 100644 (file)
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -578,7 +578,7 @@ public class Http11Protocol
 
                 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 {