From dcf98fd675ce259dbb761ccc0417cf7741b0c2ac Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 8 Aug 2013 18:07:42 +1000 Subject: [PATCH] 414635 Modular start.d and jetty.base property Made https and spdy mutually exclusive --- .../start.d/{210-https.ini => 210-https.ini.available} | 2 ++ .../start.d/{210-spdy.ini => 210-spdy.ini.available} | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) rename jetty-distribution/src/main/resources/start.d/{210-https.ini => 210-https.ini.available} (94%) rename jetty-distribution/src/main/resources/start.d/{210-spdy.ini => 210-spdy.ini.available} (83%) diff --git a/jetty-distribution/src/main/resources/start.d/210-https.ini b/jetty-distribution/src/main/resources/start.d/210-https.ini.available similarity index 94% rename from jetty-distribution/src/main/resources/start.d/210-https.ini rename to jetty-distribution/src/main/resources/start.d/210-https.ini.available index 8599e7a65f3..f518d158164 100644 --- a/jetty-distribution/src/main/resources/start.d/210-https.ini +++ b/jetty-distribution/src/main/resources/start.d/210-https.ini.available @@ -5,6 +5,8 @@ jetty.https.port=8443 +EXCLUDE=spdy + DEFINE=https OPTION=https DEPEND=ssl diff --git a/jetty-distribution/src/main/resources/start.d/210-spdy.ini b/jetty-distribution/src/main/resources/start.d/210-spdy.ini.available similarity index 83% rename from jetty-distribution/src/main/resources/start.d/210-spdy.ini rename to jetty-distribution/src/main/resources/start.d/210-spdy.ini.available index 300b665b560..d6f70c38d2c 100644 --- a/jetty-distribution/src/main/resources/start.d/210-spdy.ini +++ b/jetty-distribution/src/main/resources/start.d/210-spdy.ini.available @@ -2,7 +2,9 @@ # SPDY Connector #----------------------------------------------------------- -jetty.spdy.port=8444 +jetty.spdy.port=8443 + +EXCLUDE=https OPTION=spdy DEPEND=npn,ssl