From 903f925a793ca6b3a02cb448606ae34b0863cf71 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Wed, 17 Jun 2015 17:22:59 +0200
Subject: [PATCH] Changed the way SSL is supported with standalone connector
 (httpd lib).   Now by default, SSL is not supported,   and if an application
 wants the SSL support,   the related .ecf has to set custom variable
 "httpd_ssl_enabled" to "true"

---
 .../standalone/src/httpd/httpd-safe.ecf       |  6 +--
 .../connectors/standalone/src/httpd/httpd.ecf |  6 +--
 library/server/wsf/package.iron               | 39 +++++++++++++++++++
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 library/server/wsf/package.iron

diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd-safe.ecf b/library/server/ewsgi/connectors/standalone/src/httpd/httpd-safe.ecf
index 2641135a..0a672db8 100644
--- a/library/server/ewsgi/connectors/standalone/src/httpd/httpd-safe.ecf
+++ b/library/server/ewsgi/connectors/standalone/src/httpd/httpd-safe.ecf
@@ -15,7 +15,7 @@
 		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
 		<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl-safe.ecf">
 			<condition>
-				<custom name="httpd_ssl_disabled" excluded_value="true"/>
+				<custom name="httpd_ssl_enabled" value="true"/>
 			</condition>
 		</library>
 		
@@ -33,12 +33,12 @@
 			</file_rule>
 			<cluster name="no_ssl" location="$|no_ssl" recursive="true">
 				<condition>
-					<custom name="httpd_ssl_disabled" value="true"/>
+					<custom name="httpd_ssl_enabled" excluded_value="true"/>
 				</condition>
 			</cluster>
 			<cluster name="ssl" location="$|ssl" recursive="true">
 				<condition>
-					<custom name="httpd_ssl_disabled" excluded_value="true"/>
+					<custom name="httpd_ssl_enabled" value="true"/>
 				</condition>
 			</cluster>
 			<cluster name="concurrency_none" location="$|concurrency\none\" recursive="true">
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd.ecf b/library/server/ewsgi/connectors/standalone/src/httpd/httpd.ecf
index aa6a08a0..4dae6c58 100644
--- a/library/server/ewsgi/connectors/standalone/src/httpd/httpd.ecf
+++ b/library/server/ewsgi/connectors/standalone/src/httpd/httpd.ecf
@@ -15,7 +15,7 @@
 		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
 		<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl.ecf">
 			<condition>
-				<custom name="httpd_ssl_disabled" excluded_value="true"/>
+				<custom name="httpd_ssl_enabled" value="true"/>
 			</condition>
 		</library>
 		
@@ -34,12 +34,12 @@
 			</file_rule>
 			<cluster name="no_ssl" location="$|no_ssl" recursive="true">
 				<condition>
-					<custom name="httpd_ssl_disabled" value="true"/>
+					<custom name="httpd_ssl_enabled" excluded_value="true"/>
 				</condition>
 			</cluster>
 			<cluster name="ssl" location="$|ssl" recursive="true">
 				<condition>
-					<custom name="httpd_ssl_disabled" excluded_value="true"/>
+					<custom name="httpd_ssl_enabled" value="true"/>
 				</condition>
 			</cluster>
 			<cluster name="concurrency_none" location="$|concurrency\none\" recursive="true">
diff --git a/library/server/wsf/package.iron b/library/server/wsf/package.iron
new file mode 100644
index 00000000..56045dd0
--- /dev/null
+++ b/library/server/wsf/package.iron
@@ -0,0 +1,39 @@
+package wsf
+
+project
+	wsf = "wsf-safe.ecf"
+	wsf = "wsf.ecf"
+	wsf_extension = "wsf_extension-safe.ecf"
+	wsf_extension = "wsf_extension.ecf"
+	wsf_policy_driven = "wsf_policy_driven-safe.ecf"
+	wsf_policy_driven = "wsf_policy_driven.ecf"
+	wsf_router_context = "wsf_router_context-safe.ecf"
+	wsf_router_context = "wsf_router_context.ecf"
+	wsf_session = "wsf_session-safe.ecf"
+	wsf_session = "wsf_session.ecf"
+	wsf_all = "connector/all-safe.ecf"
+	wsf_cgi = "connector/cgi-safe.ecf"
+	wsf_cgi = "connector/cgi.ecf"
+	wsf_libfcgi = "connector/libfcgi-safe.ecf"
+	wsf_libfcgi = "connector/libfcgi.ecf"
+	wsf_nino = "connector/nino-safe.ecf"
+	wsf_nino = "connector/nino.ecf"
+	wsf_openshift = "connector/openshift-safe.ecf"
+	default_cgi = "default/cgi-safe.ecf"
+	default_cgi = "default/cgi.ecf"
+	default_libfcgi = "default/libfcgi-safe.ecf"
+	default_libfcgi = "default/libfcgi.ecf"
+	default_nino = "default/nino-safe.ecf"
+	default_nino = "default/nino.ecf"
+	default_openshift = "default/openshift-safe.ecf"
+
+note
+	title: Web Server Foundation
+	description: Core of the Eiffel Web Framework, used to build web server application.
+	tags: ewf,server,httpd,request,connector
+	license: Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)
+	link[license]: https://github.com/EiffelWebFramework/EWF/blob/master/LICENSE
+	link[source]: "Github" https://github.com/EiffelWebFramework/EWF
+	link[doc]: "Documentation" http://eiffelwebframework.github.io/EWF/
+
+end