414635 Modular start.d and jetty.base property

Made https and spdy mutually exclusive
2013-08-08 18:07:42 +10:00 · 2013-08-08 18:07:42 +10:00 · dcf98fd675
parent 21e7b67cc7
commit dcf98fd675
2 changed files with 5 additions and 1 deletions
--- a/jetty-distribution/src/main/resources/start.d/210-https.ini.available
+++ 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
--- a/jetty-distribution/src/main/resources/start.d/210-spdy.ini.available
+++ 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