From a4d737d548bec7cfa5fb0d4810bdda657b7cd10b Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <github@djoce.net>
Date: Fri, 14 Oct 2016 14:32:04 +0200
Subject: [PATCH] Be sure to use ecf custom variable "ssl_enabled" and not the
 variant "httpd_ssl_enabled" or else. Include again the openssl include folder
 for EiffelStudio before 16.11, otherwise eif_openssl is not found.

---
 examples/simple_ssl/simple_ssl.ecf            |  2 +-
 .../http_network/http_network-safe.ecf        | 22 ++++++++++++++++
 library/network/http_network/http_network.ecf | 25 +++++++++++++++++++
 .../echo_websocket_server-safe.ecf            | 13 +++++-----
 .../standalone/test_standalone-safe.ecf       |  2 +-
 tests/all-stable-safe.ecf                     |  2 +-
 6 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/examples/simple_ssl/simple_ssl.ecf b/examples/simple_ssl/simple_ssl.ecf
index 51e2b9a8..bbe9d07e 100644
--- a/examples/simple_ssl/simple_ssl.ecf
+++ b/examples/simple_ssl/simple_ssl.ecf
@@ -13,7 +13,7 @@
 		</option>
 		<setting name="console_application" value="true"/>
 		<setting name="concurrency" value="scoop"/>
-		<variable name="httpd_ssl_enabled" value="true"/>
+		<variable name="ssl_enabled" value="true"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>
diff --git a/library/network/http_network/http_network-safe.ecf b/library/network/http_network/http_network-safe.ecf
index 4ab84e3e..be8af7c2 100644
--- a/library/network/http_network/http_network-safe.ecf
+++ b/library/network/http_network/http_network-safe.ecf
@@ -34,6 +34,28 @@
 				<custom name="httpd_ssl_enabled" value="true"/>
 			</condition>
 		</library>
+
+		<external_include location="$(ISE_LIBRARY)/unstable/library/network/socket/netssl/spec/include">
+			<condition>
+				<platform excluded_value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_include location="$(ISE_LIBRARY)\unstable\library\network\socket\netssl\spec\include">
+			<condition>
+				<platform value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_cflag value="-D_WINSOCKAPI_">
+			<condition>
+				<platform value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_cflag>
 		<cluster name="network" location=".\src\">
 			<file_rule>
 				<exclude>/http_stream_socket_ext.e$</exclude>
diff --git a/library/network/http_network/http_network.ecf b/library/network/http_network/http_network.ecf
index ba0624f4..309c5d17 100644
--- a/library/network/http_network/http_network.ecf
+++ b/library/network/http_network/http_network.ecf
@@ -34,6 +34,28 @@
 				<custom name="httpd_ssl_enabled" value="true"/>
 			</condition>
 		</library>
+
+		<external_include location="$(ISE_LIBRARY)/unstable/library/network/socket/netssl/spec/include">
+			<condition>
+				<platform excluded_value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_include location="$(ISE_LIBRARY)\unstable\library\network\socket\netssl\spec\include">
+			<condition>
+				<platform value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_cflag value="-D_WINSOCKAPI_">
+			<condition>
+				<platform value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_cflag>
 		<cluster name="network" location=".\src\">
 			<file_rule>
 				<exclude>/http_stream_socket_ext.e$</exclude>
@@ -95,4 +117,7 @@
 			</cluster>
 		</cluster>
 	</target>
+	<target name="http_network_ssl" extends="http_network">
+		<variable name="ssl_enabled" value="true" />
+	</target>
 </system>
diff --git a/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server-safe.ecf b/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server-safe.ecf
index f13448c2..7c5830b1 100644
--- a/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server-safe.ecf
+++ b/library/network/websocket/server/example/echo_websocket_server/echo_websocket_server-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="echo_websocket_server" uuid="C9B3DA5F-DF0D-4C0F-924A-130B5C1E6604">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="echo_websocket_server" uuid="C9B3DA5F-DF0D-4C0F-924A-130B5C1E6604">
 	<target name="common">
 		<file_rule>
 			<exclude>/.git$</exclude>
@@ -7,11 +7,12 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option concurrency="none" debug="true" warning="true" full_class_checking="false" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional">
+		<option debug="true" warning="true" full_class_checking="false" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional">
 			<debug name="ws" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf">
 			<option>
 				<assertions precondition="true"/>
@@ -30,18 +31,16 @@
 	</target>
 	<target name="echo_websocket_server_mt" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option concurrency="thread" root_concurrency="thread">
-		</option>
+		<setting name="concurrency" value="thread"/>
 	</target>
 	<target name="echo_websocket_server_mt_ssl" extends="echo_websocket_server_mt">
 		<variable name="ssl_enabled" value="true"/>
 	</target>
 	<target name="echo_websocket_server_scoop" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option concurrency="scoop" root_concurrency="scoop">
-		</option>
+		<setting name="concurrency" value="scoop"/>
 	</target>
 	<target name="echo_websocket_server_scoop_ssl" extends="echo_websocket_server_scoop">
-		<variable name="httpd_ssl_enabled" value="true"/>
+		<variable name="ssl_enabled" value="true"/>
 	</target>
 </system>
diff --git a/library/server/ewsgi/connectors/standalone/test_standalone-safe.ecf b/library/server/ewsgi/connectors/standalone/test_standalone-safe.ecf
index e845e230..80e14a66 100644
--- a/library/server/ewsgi/connectors/standalone/test_standalone-safe.ecf
+++ b/library/server/ewsgi/connectors/standalone/test_standalone-safe.ecf
@@ -27,7 +27,7 @@
 	<target name="test_connector_standalone" extends="test_standalone_scoop">
 	</target>
 	<target name="test_standalone_scoop_ssl" extends="test_standalone_scoop">
-		<variable name="httpd_ssl_enabled" value="true"/>
+		<variable name="ssl_enabled" value="true"/>
 		<variable name="libcurl_http_client_disabled" value="true"/>
 		<variable name="net_http_client_disabled" value="false"/>
 		<variable name="netssl_http_client_enabled" value="true"/>
diff --git a/tests/all-stable-safe.ecf b/tests/all-stable-safe.ecf
index 5f7faa2b..3f9afb1d 100644
--- a/tests/all-stable-safe.ecf
+++ b/tests/all-stable-safe.ecf
@@ -67,6 +67,6 @@
 	<target name="all_stable_with_ssl" extends="all_stable">
 		<description>Compiling with ssl enabled</description>
 		<root all_classes="true"/>
-		<variable name="httpd_ssl_enabled" value="true"/>
+		<variable name="ssl_enabled" value="true"/>
 	</target>
 </system>