Ability to create a connector using a custom protocol specification for embedded.

Fix for bug 42309

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

diff --git a/java/org/apache/catalina/startup/Embedded.java b/java/org/apache/catalina/startup/Embedded.java
index 30f3b81..d3e21ff 100644 (file)
--- a/java/org/apache/catalina/startup/Embedded.java
+++ b/java/org/apache/catalina/startup/Embedded.java
@@ -427,7 +427,10 @@ public class Embedded  extends StandardService implements Lifecycle {
                 connector = new Connector();
                 connector.setScheme("https");
                 connector.setSecure(true);
+                connector.setProperty("SSLEnabled","true");
                 // FIXME !!!! SET SSL PROPERTIES
+            } else {
+                connector = new Connector(protocol);
             }
 
             if (address != null) {