From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 29 Oct 2009 21:48:04 +0000 (+0000)
Subject: SSL should be based on SSLEnabled, not secure flag
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=07a5b0c63cdf7a2fee176b41b2c94bfb853676e0;p=tomcat7.0

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 1121f009c..9246e5fe2 100644
--- 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 a6ee79635..0ed13e069 100644
--- 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 {