From 13ad524a03ede6cfd790aa8427c0b4c88f6a773b Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <git@djoce.net>
Date: Tue, 18 Oct 2016 14:23:58 +0200
Subject: [PATCH] Fixed httpd and http_network ecf in non void-safe mode.

---
 .../lib/httpd/http_network-safe.ecf           | 10 +++
 .../standalone/lib/httpd/http_network.ecf     | 10 +++
 .../connectors/standalone/lib/httpd/httpd.ecf | 76 +++++++++++--------
 3 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/http_network-safe.ecf b/library/server/ewsgi/connectors/standalone/lib/httpd/http_network-safe.ecf
index 68edf7df..f560a994 100644
--- a/library/server/ewsgi/connectors/standalone/lib/httpd/http_network-safe.ecf
+++ b/library/server/ewsgi/connectors/standalone/lib/httpd/http_network-safe.ecf
@@ -10,6 +10,16 @@
 		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="standard">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
+		<external_include location="$ECF_CONFIG_PATH/spec/include">
+			<condition>
+				<version type="compiler" min="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_include location="$ECF_CONFIG_PATH/spec/include_until_16_05">
+			<condition>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf" readonly="false"/>
 		<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl-safe.ecf">
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/http_network.ecf b/library/server/ewsgi/connectors/standalone/lib/httpd/http_network.ecf
index 9f4067ec..87850a48 100644
--- a/library/server/ewsgi/connectors/standalone/lib/httpd/http_network.ecf
+++ b/library/server/ewsgi/connectors/standalone/lib/httpd/http_network.ecf
@@ -10,6 +10,16 @@
 		<option warning="true" full_class_checking="false" void_safety="none" syntax="standard">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
+		<external_include location="$ECF_CONFIG_PATH/spec/include">
+			<condition>
+				<version type="compiler" min="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_include location="$ECF_CONFIG_PATH/spec/include_until_16_05">
+			<condition>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
 		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd.ecf b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd.ecf
index e6e87f66..7fcf74e6 100644
--- a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd.ecf
+++ b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd.ecf
@@ -10,6 +10,16 @@
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
 		</option>
 		<setting name="concurrency" value="thread"/>
+		<external_include location="$ECF_CONFIG_PATH/spec/include">
+			<condition>
+				<version type="compiler" min="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_include location="$ECF_CONFIG_PATH/spec/include_until_16_05">
+			<condition>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<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">
@@ -23,6 +33,39 @@
 			</condition>
 		</library>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
+		<cluster name="httpd_server" location=".\" recursive="true">
+			<file_rule>
+				<exclude>/concurrency$</exclude>
+				<exclude>/network$</exclude>
+				<exclude>/no_ssl$</exclude>
+				<exclude>/ssl$</exclude>
+			</file_rule>
+			<cluster name="no_ssl" location="$|no_ssl\" recursive="true">
+				<condition>
+					<custom name="httpd_ssl_enabled" excluded_value="true"/>
+				</condition>
+			</cluster>
+			<cluster name="ssl" location="$|ssl\" recursive="true">
+				<condition>
+					<custom name="httpd_ssl_enabled" value="true"/>
+				</condition>
+			</cluster>
+			<cluster name="concurrency_none" location="$|concurrency\none\" recursive="true">
+				<condition>
+					<concurrency value="none"/>
+				</condition>
+			</cluster>
+			<cluster name="concurrency_scoop" location="$|concurrency\scoop\" recursive="true">
+				<condition>
+					<concurrency value="scoop"/>
+				</condition>
+			</cluster>
+			<cluster name="concurrency_thread" location="$|concurrency\thread\" recursive="true">
+				<condition>
+					<concurrency value="thread"/>
+				</condition>
+			</cluster>
+		</cluster>
 		<cluster name="network" location=".\network\">
 			<file_rule>
 				<exclude>/httpd_stream_socket_ext.e$</exclude>
@@ -54,38 +97,5 @@
 				</condition>
 			</cluster>
 		</cluster>
-		<cluster name="httpd_server" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/concurrency$</exclude>
-				<exclude>/no_ssl$</exclude>
-				<exclude>/ssl$</exclude>
-				<exclude>/network$</exclude>
-			</file_rule>
-			<cluster name="no_ssl" location="$|no_ssl\" recursive="true">
-				<condition>
-					<custom name="httpd_ssl_enabled" excluded_value="true"/>
-				</condition>
-			</cluster>
-			<cluster name="ssl" location="$|ssl\" recursive="true">
-				<condition>
-					<custom name="httpd_ssl_enabled" value="true"/>
-				</condition>
-			</cluster>
-			<cluster name="concurrency_none" location="$|concurrency\none\" recursive="true">
-				<condition>
-					<concurrency value="none"/>
-				</condition>
-			</cluster>
-			<cluster name="concurrency_scoop" location="$|concurrency\scoop\" recursive="true">
-				<condition>
-					<concurrency value="scoop"/>
-				</condition>
-			</cluster>
-			<cluster name="concurrency_thread" location="$|concurrency\thread\" recursive="true">
-				<condition>
-					<concurrency value="thread"/>
-				</condition>
-			</cluster>
-		</cluster>
 	</target>
 </system>