X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.lib.jetty%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjetty%2FJettyHttpServer.java;h=98975c3c843ad7c152a4c1815f738a812c6ca130;hb=4086635cfaa04c8a184124048794398b0ba96a55;hp=1254781e81d0802201db9945801268058cd0c201;hpb=f1b9c5f7bd5ab6ea3337cb59317bb6e6d449d88e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java
index 1254781e8..98975c3c8 100644
--- a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java
+++ b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java
@@ -2,11 +2,13 @@ package org.argeo.cms.jetty;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import javax.net.ssl.SSLContext;
 import javax.servlet.ServletException;
 import javax.websocket.server.ServerContainer;
 
@@ -170,6 +172,16 @@ public class JettyHttpServer extends HttpsServer {
 			}
 
 			if (httpsEnabled) {
+				if (httpsConfigurator == null) {
+					// we make sure that an HttpSConfigurator is set, so that clients can detect
+					// whether this server is HTTP or HTTPS
+					try {
+						httpsConfigurator = new HttpsConfigurator(SSLContext.getDefault());
+					} catch (NoSuchAlgorithmException e) {
+						throw new IllegalStateException("Cannot initalise SSL Context", e);
+					}
+				}
+
 				SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
 				// sslContextFactory.setKeyStore(KeyS)