Fixed compilation of proxy and simple examples.

Made the websocket client library scoop capable.
If the count for put_file_content is not positive (i.e <= 0), do not send anything.
2016-12-05 15:56:46 +01:00 · 2016-12-01 21:20:14 +01:00 · 2016-12-01 21:08:13 +01:00 · 2016-12-01 20:41:03 +01:00 · 2016-12-01 18:43:22 +01:00 · 2016-12-01 18:14:07 +01:00
360 changed files with 15699 additions and 1581 deletions
--- a/contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf
+++ b/contrib/library/network/server/nino/example/SimpleWebServer/web_server-safe.ecf
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="web_server" uuid="B1D3254D-A58E-4259-9796-8A2843A511A9">
+<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="web_server" uuid="B1D3254D-A58E-4259-9796-8A2843A511A9">
 	<target name="web_server">
 		<root class="APPLICATION" feature="make"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option debug="true" warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option debug="true" warning="true"  void_safety="all">
 			<debug name="nino" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
--- a/contrib/library/network/server/nino/example/SimpleWebServer/web_server.ecf
+++ b/contrib/library/network/server/nino/example/SimpleWebServer/web_server.ecf
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="web_server" uuid="B1D3254D-A58E-4259-9796-8A2843A511A9">
+<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="web_server" uuid="B1D3254D-A58E-4259-9796-8A2843A511A9">
 	<target name="web_server">
 		<root class="APPLICATION" feature="make"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="none">
+		<option warning="true"  void_safety="none">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
--- a/contrib/library/network/server/nino/nino-safe.ecf
+++ b/contrib/library/network/server/nino/nino-safe.ecf
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="nino" uuid="32C1D67D-33DE-4F1E-864B-D45388F2E3E6" library_target="nino">
+<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="nino" uuid="32C1D67D-33DE-4F1E-864B-D45388F2E3E6" library_target="nino">
 	<target name="nino">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="transitional">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		<option warning="true"  void_safety="all">
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -22,13 +21,13 @@
 			<file_rule>
 				<exclude>tcp_stream_socket.e</exclude>
 				<condition>
-					<version type="compiler" max="16.11"/>
+					<version type="compiler" max="16.11.0.0"/>
 				</condition>
 			</file_rule>
 		</cluster>
 		<cluster name="spec_until_16_05" location=".\library\spec\until_16_05\" recursive="true">
 			<condition>
-				<version type="compiler" max="16.11"/>
+				<version type="compiler" max="16.11.0.0"/>
 			</condition>
 		</cluster>
 	</target>
--- a/contrib/library/network/server/nino/nino.ecf
+++ b/contrib/library/network/server/nino/nino.ecf
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="nino" uuid="32C1D67D-33DE-4F1E-864B-D45388F2E3E6" library_target="nino">
+<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="nino" uuid="32C1D67D-33DE-4F1E-864B-D45388F2E3E6" library_target="nino">
 	<target name="nino">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" void_safety="none">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		<option warning="true"  void_safety="none">
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
@@ -22,13 +21,13 @@
 			<file_rule>
 				<exclude>tcp_stream_socket.e</exclude>
 				<condition>
-					<version type="compiler" max="16.11"/>
+					<version type="compiler" max="16.11.0.0"/>
 				</condition>
 			</file_rule>
 		</cluster>
 		<cluster name="spec_until_16_05" location=".\library\spec\until_16_05\" recursive="true">
 			<condition>
-				<version type="compiler" max="16.11"/>
+				<version type="compiler" max="16.11.0.0"/>
 			</condition>
 		</cluster>
 	</target>
--- a/doc/workbook/basics/simple/simple.ecf
+++ b/doc/workbook/basics/simple/simple.ecf
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="simple" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="simple">
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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="simple" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="simple_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -23,7 +23,7 @@
 	</target>
 	<target name="simple_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
@@ -31,7 +31,7 @@
 	</target>
 	<target name="simple_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
--- a/doc/workbook/basics/simple_html/simple_html.ecf
+++ b/doc/workbook/basics/simple_html/simple_html.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="simple_html" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="simple_html">
+<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="simple_html" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="simple_html_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +23,7 @@
 	</target>
 	<target name="simple_html_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +31,7 @@
 	</target>
 	<target name="simple_html_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/generating_response/exel/exel.ecf
+++ b/doc/workbook/generating_response/exel/exel.ecf
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="exel" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="exel">l
+<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="exel" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>l
+	
+		
+			/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +18,7 @@
 	</target>
 	<target name="exel_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +26,7 @@
 	</target>
 	<target name="exel_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +34,7 @@
 	</target>
 	<target name="exel_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/generating_response/headers/headers.ecf
+++ b/doc/workbook/generating_response/headers/headers.ecf
@@ -1,12 +1,12 @@
 "1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="headers" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="headers">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="headers" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="headers_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +23,7 @@
 	</target>
 	<target name="headers_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +31,7 @@
 	</target>
 	<target name="headers_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/generating_response/search/search.ecf
+++ b/doc/workbook/generating_response/search/search.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="search" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="search">
+<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="search" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="search_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +23,7 @@
 	</target>
 	<target name="search_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +31,7 @@
 	</target>
 	<target name="search_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/generating_response/status/status.ecf
+++ b/doc/workbook/generating_response/status/status.ecf
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="status" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="status">l
+<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="status" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>l
+	
+		
+			/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +18,7 @@
 	</target>
 	<target name="status_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +26,7 @@
 	</target>
 	<target name="status_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +34,7 @@
 	</target>
 	<target name="status_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/handling_cookies/example/example.ecf
+++ b/doc/workbook/handling_cookies/example/example.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="example" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="example">
+<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="example" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="example_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,15 +23,15 @@
 	</target>
 	<target name="example_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
 		<cluster name="example" location=".\" recursive="true"/>
-	</target>	
+	</target>
 	<target name="example_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/handling_request/form/get/form.ecf
+++ b/doc/workbook/handling_request/form/get/form.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="form"  library_target="form">
+<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="form" uuid="4BF86AB0-AEEE-46BF-93DE-0463E3510ACE">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="form_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +23,7 @@
 	</target>
 	<target name="form_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +31,7 @@
 	</target>
 	<target name="form_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/handling_request/form/post/form.ecf
+++ b/doc/workbook/handling_request/form/post/form.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="form" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="form">
+<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="form" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="form_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +23,7 @@
 	</target>
 	<target name="form_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +31,7 @@
 	</target>
 	<target name="form_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/handling_request/headers/browser_name/browsers.ecf
+++ b/doc/workbook/handling_request/headers/browser_name/browsers.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="browsers"  library_target="browsers">
+<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="browsers" uuid="6E4221A7-CB45-4B14-98F2-75F9C273DF68">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="browsers_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +23,7 @@
 	</target>
 	<target name="browsers_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +31,7 @@
 	</target>
 	<target name="browsers_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/handling_request/headers/cgi_variables/cgi_variables.ecf
+++ b/doc/workbook/handling_request/headers/cgi_variables/cgi_variables.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="cgi_variables"  library_target="cgi_variables">
+<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="cgi_variables" uuid="73FCA1D1-DE9D-4112-96BB-92F2C40AC5D1">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="cgi_variables_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +23,7 @@
 	</target>
 	<target name="cgi_variables_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +31,7 @@
 	</target>
 	<target name="cgi_variables_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/handling_request/headers/header_fields/header_fields.ecf
+++ b/doc/workbook/handling_request/headers/header_fields/header_fields.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="header_fields"  library_target="header_fields">
+<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="header_fields" uuid="F4644919-0908-470F-A0C1-66C2E08C2D90">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="header_fields_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +23,7 @@
 	</target>
 	<target name="header_fields_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +31,7 @@
 	</target>
 	<target name="header_fields_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/handling_request/upload_file/upload.ecf
+++ b/doc/workbook/handling_request/upload_file/upload.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="upload"  library_target="upload">
+<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="upload" uuid="274576E6-E7EA-420F-ADED-0CC6955E48DD">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -15,7 +15,7 @@
 	</target>
 	<target name="upload_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\standalone-safe.ecf"/>
@@ -23,7 +23,7 @@
 	</target>
 	<target name="upload_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\cgi-safe.ecf"/>
@@ -31,7 +31,7 @@
 	</target>
 	<target name="upload_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\default\libfcgi-safe.ecf"/>
--- a/doc/workbook/handling_request/upload_file/upload.rc
+++ b/doc/workbook/handling_request/upload_file/upload.rc
@@ -1,6 +0,0 @@
-#include <windows.h>
-
-STRINGTABLE
-BEGIN
-	1 "This Program was made using EiffelStudio using Visual Studio C++"
-END
--- a/draft/library/protocol/syndication/atom/atom-safe.ecf
+++ b/draft/library/protocol/syndication/atom/atom-safe.ecf
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="atom" uuid="076DEABB-20DA-43E9-A4C7-F3FAEDF5B1FC" library_target="atom">
+<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="atom" uuid="076DEABB-20DA-43E9-A4C7-F3FAEDF5B1FC" library_target="atom">
 	<target name="atom">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+		<option warning="true" void_safety="all">
 		</option>
-		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf"/>
-		<cluster name="src" location="./src" recursive="true"/>
+		<setting name="concurrency" value="scoop"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/draft/library/protocol/syndication/atom/atom.ecf
+++ b/draft/library/protocol/syndication/atom/atom.ecf
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="atom" uuid="076DEABB-20DA-43E9-A4C7-F3FAEDF5B1FC" library_target="atom">
+<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="atom" uuid="076DEABB-20DA-43E9-A4C7-F3FAEDF5B1FC" library_target="atom">
 	<target name="atom">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
+		<option warning="true" void_safety="none">
 		</option>
-		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<cluster name="src" location="./src" recursive="true"/>
+		<setting name="concurrency" value="scoop"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/draft/library/protocol/syndication/rss/rss-safe.ecf
+++ b/draft/library/protocol/syndication/rss/rss-safe.ecf
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="rss" uuid="8D8E3E5A-2685-40AF-9EF9-E3113B3C62AA" library_target="rss">
+<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="rss" uuid="8D8E3E5A-2685-40AF-9EF9-E3113B3C62AA" library_target="rss">
 	<target name="rss">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+		<option warning="true" void_safety="all">
 		</option>
-		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf"/>
-		<cluster name="src" location="./src" recursive="true"/>
+		<setting name="concurrency" value="scoop"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/draft/library/protocol/syndication/rss/rss.ecf
+++ b/draft/library/protocol/syndication/rss/rss.ecf
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="rss" uuid="8D8E3E5A-2685-40AF-9EF9-E3113B3C62AA" library_target="rss">
+<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="rss" uuid="8D8E3E5A-2685-40AF-9EF9-E3113B3C62AA" library_target="rss">
 	<target name="rss">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
+		<option warning="true" void_safety="none">
 		</option>
-		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<cluster name="src" location="./src" recursive="true"/>
+		<setting name="concurrency" value="scoop"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/draft/library/security/oauth/oauth-safe.ecf
+++ b/draft/library/security/oauth/oauth-safe.ecf
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="oauth" uuid="F8B4DF74-C71B-45A3-9B9A-F6141C4D3C56" library_target="oauth">
+<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="oauth" uuid="F8B4DF74-C71B-45A3-9B9A-F6141C4D3C56" library_target="oauth">
 	<target name="oauth">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+		<option warning="true" void_safety="all">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
--- a/draft/library/security/oauth/oauth.ecf
+++ b/draft/library/security/oauth/oauth.ecf
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="oauth" uuid="F8B4DF74-C71B-45A3-9B9A-F6141C4D3C56" library_target="oauth">
+<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="oauth" uuid="F8B4DF74-C71B-45A3-9B9A-F6141C4D3C56" library_target="oauth">
 	<target name="oauth">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
+		<option warning="true" void_safety="none">
 		</option>
-		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<cluster name="src" location="./src" recursive="true"/>
+		<setting name="concurrency" value="scoop"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/draft/library/server/wsf_js_widget/examples/custom-template/js_widget_template.ecf
+++ b/draft/library/server/wsf_js_widget/examples/custom-template/js_widget_template.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="js_widget_template" library_target="js_widget_template">
+<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="js_widget_template" uuid="5C5C33AA-9DCF-42CF-A85A-A6E650E7234F">
 	<target name="common" abstract="true">
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -17,8 +17,7 @@
 	<target name="js_widget_template_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
 		<library name="default_standalone" location="..\..\..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
-		<cluster name="js_widget_template" location=".\src\" recursive="true">
-		</cluster>
+		<cluster name="js_widget_template" location=".\src\" recursive="true"/>
 	</target>
 	<target name="js_widget_template_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
--- a/draft/library/server/wsf_js_widget/examples/custom/js_widget_custom.ecf
+++ b/draft/library/server/wsf_js_widget/examples/custom/js_widget_custom.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="js_custom_widget" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="js_custom_widget">
+<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="js_custom_widget" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -17,8 +17,7 @@
 	<target name="js_custom_widget_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
 		<library name="default_standalone" location="..\..\..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
-		<cluster name="js_custom_widget" location=".\src\" recursive="true">
-		</cluster>
+		<cluster name="js_custom_widget" location=".\src\" recursive="true"/>
 	</target>
 	<target name="js_custom_widget_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
--- a/draft/library/server/wsf_js_widget/examples/demo/demo.ecf
+++ b/draft/library/server/wsf_js_widget/examples/demo/demo.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="demo" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="demo">
+<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="demo" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all"  syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -18,7 +18,7 @@
 	</target>
 	<target name="demo_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_standalone" location="..\..\..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
@@ -26,7 +26,7 @@
 	</target>
 	<target name="demo_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="..\..\..\..\..\..\library\server\wsf\default\cgi-safe.ecf"/>
@@ -34,7 +34,7 @@
 	</target>
 	<target name="demo_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="..\..\..\..\..\..\library\server\wsf\default\libfcgi-safe.ecf"/>
--- a/draft/library/server/wsf_js_widget/examples/demo/grid_page.e
+++ b/draft/library/server/wsf_js_widget/examples/demo/grid_page.e
@@ -20,15 +20,16 @@ feature

 	initialize_controls
 		do
-			Precursor
-			control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", "Grid Demo"))
 			create datasource.make_news
 			create search_query.make (create {GOOGLE_AUTOCOMPLETION}.make)
 			search_query.add_class ("form-control")
+			create grid.make (<<create {WSF_GRID_COLUMN}.make ("Title", "title"), create {WSF_GRID_COLUMN}.make ("Content", "content")>>, datasource)
+
+			Precursor
+			control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", "Grid Demo"))
 			search_query.set_change_event (agent change_query)
 			control.add_control (search_query)
 			control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h2", "", "Results"))
-			create grid.make (<<create {WSF_GRID_COLUMN}.make ("Title", "title"), create {WSF_GRID_COLUMN}.make ("Content", "content")>>, datasource)
 			control.add_control (grid)
 			navbar.set_active (2)
 		end
--- a/draft/library/server/wsf_js_widget/examples/demo/repeater_page.e
+++ b/draft/library/server/wsf_js_widget/examples/demo/repeater_page.e
@@ -20,15 +20,17 @@ feature

 	initialize_controls
 		do
-			Precursor
-			control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", " Repeater Demo"))
 			create datasource.make_news
+			create repeater.make (datasource)
 			create search_query.make (create {GOOGLE_AUTOCOMPLETION}.make)
 			search_query.add_class ("form-control")
+
+			Precursor
+			control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", " Repeater Demo"))
 			search_query.set_change_event (agent change_query)
 			control.add_control (search_query)
 			control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h2", "", "Results"))
-			create repeater.make (datasource)
+
 			control.add_control (repeater)
 			navbar.set_active (3)
 		end
--- a/draft/library/server/wsf_js_widget/examples/demo/sample_page.e
+++ b/draft/library/server/wsf_js_widget/examples/demo/sample_page.e
@@ -28,7 +28,6 @@ feature
 			cats_container: WSF_FORM_ELEMENT_CONTROL [LIST [STRING_32]]
 			source: INCREASING_PROGRESSSOURCE
 		do
-			Precursor
 			create form.make
 				--Number 1
 			create textbox1.make ({STRING_32} "1")
@@ -64,24 +63,33 @@ feature
 			form.add_control (cats_container)
 				--Button 1
 			create button1.make ("Update")
-			button1.set_click_event (agent handle_click)
 			button1.add_class ("col-lg-offset-2")
 			form.add_control (button1)
 				--Button 2
 			create button2.make ("Start Modal Grid")
-			button2.set_click_event (agent run_modal)
 			form.add_control (button2)
 				--Result
 			create result_html.make ("p", "")
 			form.add_control (create {WSF_FORM_ELEMENT_CONTROL [STRING_32]}.make ("Result", result_html))
-			control.add_control (form)

 				--Progress bar
-			control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h4", "", "Autoincrementing progressbar"))
 			create source.make
 			create progress.make_with_source (source)
 			source.set_control (progress)
 			progress.set_isolation (true)
+
+
+			Precursor
+
+			control.add_control (form)
+
+				-- Actions
+			button1.set_click_event (agent handle_click)
+			button2.set_click_event (agent run_modal)
+
+
+				--Progress bar
+			control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h4", "", "Autoincrementing progressbar"))
 			control.add_control (progress)
 			navbar.set_active (1)
 		end
--- a/draft/library/server/wsf_js_widget/examples/demo/slider_page.e
+++ b/draft/library/server/wsf_js_widget/examples/demo/slider_page.e
@@ -20,7 +20,6 @@ feature -- Implementation

 	initialize_controls
 		do
-			Precursor
 			create slider.make
 				--slider.add_control (form, Void)
 				--slider.add_image ("http://www.placesmustseen.com/wp-content/uploads/2013/01/paris-eiffel-tower.jpg", "Eiffel Tower")
@@ -28,6 +27,8 @@ feature -- Implementation
 			slider.add_image ("http://31.media.tumblr.com/5b5ae35c4f88d4b80aeb21e36263c6e6/tumblr_mtw7mhZsCe1st5lhmo1_1280.jpg", "landscape")
 			slider.add_image ("http://25.media.tumblr.com/403969159fb1642e67ed702f28e966e0/tumblr_muuig0890N1st5lhmo1_1280.jpg", "landscape")
 			slider.add_image ("http://24.media.tumblr.com/d349779e7216167e7c0ca3af66817794/tumblr_mufrlh9WqW1st5lhmo1_1280.jpg", "landscape")
+
+			Precursor
 			control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", " Image Slider Demo"))
 			control.add_control (slider)
 			navbar.set_active (4)
--- a/draft/library/server/wsf_js_widget/examples/demo/upload_page.e
+++ b/draft/library/server/wsf_js_widget/examples/demo/upload_page.e
@@ -21,20 +21,25 @@ feature -- Implementation
 	initialize_controls
 		local
 		do
+			create form.make
+			create filebox.make
+			create n1_container.make ("File Upload", filebox)
+			create filebox2.make
+			create n2_container.make ("Auto start Upload", filebox2)
+			create filebox3.make_with_image_preview
+			create n3_container.make ("Image Upload", filebox3)
+			create button1.make ("Update")
+			
 			Precursor
 			control.add_control (create {WSF_BASIC_CONTROL}.make_with_body ("h1", "", "File Upload Demo"))
-			create form.make
+
 				--File
-			create filebox.make
 			filebox.set_upload_function (agent upload_file)
 			filebox.set_upload_done_event (agent submit_form)
-			create n1_container.make ("File Upload", filebox)
 			n1_container.add_validator (create {WSF_FILESIZE_VALIDATOR}.make (10000000, "File must be smaller than 10MB"))
 			form.add_control (n1_container)
 				--File
-			create filebox2.make
 			filebox2.set_upload_function (agent upload_file)
-			create n2_container.make ("Auto start Upload", filebox2)
 			filebox2.set_change_event (agent
 				do
 					n1_container.validate
@@ -45,15 +50,13 @@ feature -- Implementation
 			n2_container.add_validator (create {WSF_FILESIZE_VALIDATOR}.make (10000000, "File must be smaller than 10MB"))
 			form.add_control (n2_container)
 				--Image
-			create filebox3.make_with_image_preview
+
 			filebox3.set_upload_function (agent upload_file)
 			filebox3.set_upload_done_event (agent submit_form)
-			create n3_container.make ("Image Upload", filebox3)
 			n3_container.add_validator (create {WSF_FILESIZE_VALIDATOR}.make (10000000, "File must be smaller than 10MB"))
 			form.add_control (n3_container)

 				--Button 1
-			create button1.make ("Update")
 			button1.set_click_event (agent submit_form)
 			button1.add_class ("col-lg-offset-2")
 			form.add_control (button1)
--- a/draft/library/server/wsf_js_widget/examples/demo/widgetapp.rc
+++ b/draft/library/server/wsf_js_widget/examples/demo/widgetapp.rc
@@ -1 +0,0 @@
-
--- a/draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_control.e
+++ b/draft/library/server/wsf_js_widget/kernel/grid/wsf_grid_control.e
@@ -23,8 +23,8 @@ feature {NONE} -- Initialization

 	make (a_columns: ITERABLE [WSF_GRID_COLUMN]; a_datasource: WSF_DATASOURCE [G])
 		do
-			make_repeater (a_datasource)
 			columns := a_columns
+			make_repeater (a_datasource)
 		end

 feature -- Render
@@ -72,4 +72,14 @@ feature -- Properties

 	columns: ITERABLE [WSF_GRID_COLUMN]

+;note
+	copyright: "2011-2016, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
 end
--- a/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e
+++ b/draft/library/server/wsf_js_widget/kernel/webcontrol/wsf_multi_control.e
@@ -199,7 +199,7 @@ feature -- Properties
 			-- List of current controls in this multi control

 ;note
-	copyright: "2011-2014, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
+	copyright: "2011-2016, Yassin Hassan, Severin Munger, Jocelyn Fiat, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
+++ b/draft/library/server/wsf_js_widget/wsf_js_widget-safe.ecf
@@ -7,8 +7,9 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="standard">
+		<option warning="true" void_safety="all">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http" location="..\..\..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf"/>
--- a/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
+++ b/draft/library/server/wsf_js_widget/wsf_js_widget.ecf
@@ -7,13 +7,14 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="false" void_safety="none" syntax="standard">
+		<option warning="true" void_safety="none">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="http" location="..\..\..\..\library\network\protocol\http\http.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>
 		<library name="pcre" location="$ISE_LIBRARY\unstable\library\text\regexp\pcre\pcre.ecf"/>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
+		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<library name="wsf" location="..\..\..\..\library\server\wsf\wsf.ecf"/>
 		<cluster name="kernel" location=".\kernel\" recursive="true"/>
 	</target>
--- a/draft/src/gewf/gewf.ecf
+++ b/draft/src/gewf/gewf.ecf
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-11-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-11-0 http://www.eiffel.com/developers/xml/configuration-1-11-0.xsd" name="gewf" uuid="2D4957D5-77D3-4EC7-BF80-E4E6AC7A3EF3">
+<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="gewf" uuid="2D4957D5-77D3-4EC7-BF80-E4E6AC7A3EF3">
 	<target name="gewf">
-		<description>Generator for EWF project </description>
+		<description>Generator for EWF project</description>
 		<root class="GEWF" feature="make"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="standard">
+		<option warning="true"  void_safety="all">
 		</option>
 		<setting name="console_application" value="true"/>
 		<setting name="executable_name" value="gewf"/>
--- a/examples/debug/debug.ecf
+++ b/examples/debug/debug.ecf
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="debug" uuid="AA458565-7711-4BE1-ADA3-91716EABFA21" library_target="debug">
+<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="debug" uuid="AA458565-7711-4BE1-ADA3-91716EABFA21">
 	<target name="common" abstract="true">
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<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"/>
 		<library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>
@@ -18,7 +19,7 @@
 	</target>
 	<target name="debug_any" extends="common">
 		<root class="EWF_DEBUG_SERVER" feature="make_and_launch"/>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="cgi" location="..\..\library\server\wsf\connector\cgi-safe.ecf" readonly="false"/>
 		<library name="libfcgi" location="..\..\library\server\wsf\connector\libfcgi-safe.ecf" readonly="false"/>
 		<library name="standalone" location="..\..\library\server\wsf\connector\standalone-safe.ecf" readonly="false"/>
@@ -27,7 +28,7 @@
 	</target>
 	<target name="debug_standalone" extends="common">
 		<root class="EWF_DEBUG_SERVER" feature="make_and_launch"/>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf" readonly="false"/>
 		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
@@ -44,6 +45,4 @@
 		<cluster name="launcher" location=".\launcher\default\" recursive="true"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
-	<target name="debug" extends="debug_standalone">
-	</target>
 </system>
--- a/examples/debug/debug.ini
+++ b/examples/debug/debug.ini
@@ -0,0 +1,2 @@
+port=9090
+verbose=true
--- a/examples/debug/debug.rc
+++ b/examples/debug/debug.rc
@@ -1,6 +0,0 @@
-#include <windows.h>
-
-STRINGTABLE
-BEGIN
-	1 "This Program was made using EiffelStudio using Visual Studio C++"
-END
--- a/examples/debug/src/ewf_debug_server.e
+++ b/examples/debug/src/ewf_debug_server.e
@@ -28,16 +28,8 @@ feature {NONE} -- Initialization
 --			set_service_option ("verbose", True)
 			set_service_option ("port", 9090)
 --			set_service_option ("base", "/www-debug/debug_service.fcgi/")
+			import_service_options (create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI}.make_from_file ("debug.ini"))
 		end

--	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
--		local
--			dbg: WSF_DEBUG_HANDLER
--		do
--			res.put_error ("OH NO uri=" + req.request_uri + "%N")
--			create dbg.make
--			dbg.execute_starts_with ("", req, res)
--		end
-
 end

--- a/examples/desktop_app/desktop_app.ecf
+++ b/examples/desktop_app/desktop_app.ecf
@@ -4,13 +4,12 @@
 	<target name="desktop_app">
 		<description>This example demonstrates how to build a vision2 desktop application that embed a web browser accessing the service of an embedded web service.</description>
 		<root class="DESKTOP_APP" feature="make_and_launch"/>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true"/>
 		</option>
 		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="ewsgi" location="..\..\library\server\ewsgi\ewsgi-safe.ecf"/>
-		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
 		<library name="vision2" location="$ISE_LIBRARY\library\vision2\vision2-safe.ecf"/>
 		<library name="web_browser" location="$ISE_LIBRARY\library\web_browser\web_browser-safe.ecf" readonly="false"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
--- a/examples/desktop_app/desktop_app.rc
+++ b/examples/desktop_app/desktop_app.rc
@@ -1,6 +0,0 @@
-#include <windows.h>
-
-STRINGTABLE
-BEGIN
-	1 "This Program was made using EiffelStudio using Visual Studio C++"
-END
--- a/examples/desktop_app/src/service/embedded_web_service.e
+++ b/examples/desktop_app/src/service/embedded_web_service.e
@@ -50,7 +50,7 @@ feature -- Execution

 feature -- Access

-	on_launched_action: detachable separate PROCEDURE [ANY, TUPLE]
+	on_launched_action: detachable separate PROCEDURE [TUPLE]

 	set_on_launched_action (act: like on_launched_action)
 		do
--- a/examples/filter/filter-safe.ecf
+++ b/examples/filter/filter-safe.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="filter" uuid="52FF4B77-0614-4D8B-9B96-C07EC852793E" library_target="filter">
+<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="filter" uuid="52FF4B77-0614-4D8B-9B96-C07EC852793E">
 	<target name="common">
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
+		<option debug="true" warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" invariant="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
--- a/examples/obsolete/v0/filter/filter-safe.ecf
+++ b/examples/obsolete/v0/filter/filter-safe.ecf
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="filter" uuid="52FF4B77-0614-4D8B-9B96-C07EC852793E" library_target="filter">
+<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="filter" uuid="52FF4B77-0614-4D8B-9B96-C07EC852793E">
 	<target name="common">
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
+		<option debug="true" warning="true"  void_safety="all">
 			<debug name="nino" enabled="true"/>
 			<assertions precondition="true" postcondition="true" invariant="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf" readonly="true"/>
-		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf" readonly="true"/>
-		<library name="http" location="../../../../library/network/protocol/http/http-safe.ecf" readonly="true"/>
-		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf"/>
-		<library name="wsf" location="..\..\..\..\library\server\obsolete\v0\wsf\wsf-safe.ecf" readonly="true"/>
-		<library name="wsf_router_context" location="..\..\..\..\library\server\obsolete\v0\wsf\wsf_router_context-safe.ecf" readonly="true"/>
-		<library name="wsf_extension" location="..\..\..\..\library\server\obsolete\v0\wsf\wsf_extension-safe.ecf" readonly="true"/>
+		<library name="http" location="..\..\..\..\library\network\protocol\http\http-safe.ecf" readonly="true"/>
 		<library name="http_authorization" location="..\..\..\..\library\server\authentication\http_authorization\http_authorization-safe.ecf" readonly="true"/>
+		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf" readonly="true"/>
+		<library name="wsf" location="..\..\..\..\library\server\obsolete\v0\wsf\wsf-safe.ecf" readonly="true"/>
+		<library name="wsf_extension" location="..\..\..\..\library\server\obsolete\v0\wsf\wsf_extension-safe.ecf" readonly="true"/>
+		<library name="wsf_router_context" location="..\..\..\..\library\server\obsolete\v0\wsf\wsf_router_context-safe.ecf" readonly="true"/>
 	</target>
 	<target name="filter_nino" extends="common">
 		<root class="FILTER_SERVER" feature="make"/>
--- a/examples/obsolete/v0/filter/filter.rc
+++ b/examples/obsolete/v0/filter/filter.rc
@@ -1,6 +0,0 @@
-#include <windows.h>
-
-STRINGTABLE
-BEGIN
-	1 "This Program was made using EiffelStudio using Visual Studio C++"
-END
--- a/examples/obsolete/v0/restbucksCRUD/client/client-safe.ecf
+++ b/examples/obsolete/v0/restbucksCRUD/client/client-safe.ecf
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="client" uuid="D0059CEB-5F5C-4D21-8C71-842BD0F88468" library_target="client">
+<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="client" uuid="D0059CEB-5F5C-4D21-8C71-842BD0F88468">
 	<target name="client">
 		<root class="RESTBUCK_CLIENT" feature="make"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+		<option warning="true"  void_safety="all">
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
--- a/examples/obsolete/v0/restbucksCRUD/client/client.ecf
+++ b/examples/obsolete/v0/restbucksCRUD/client/client.ecf
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="client" uuid="D0059CEB-5F5C-4D21-8C71-842BD0F88468">
+<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="client" uuid="D0059CEB-5F5C-4D21-8C71-842BD0F88468">
 	<target name="client">
 		<root class="RESTBUCK_CLIENT" feature="make"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
+		<option warning="true"  void_safety="none">
 		</option>
 		<setting name="concurrency" value="thread"/>
-		<library name="http_client" location="../../../../../library/network/http_client/http_client.ecf"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="http_client" location="..\..\..\..\..\library\network\http_client\http_client.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>
-		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<library name="thread" location="$ISE_LIBRARY/library/thread/thread.ecf"/>
-		<cluster name="src" location="./src" recursive="true"/>
+		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/examples/obsolete/v0/restbucksCRUD/client/client.rc
+++ b/examples/obsolete/v0/restbucksCRUD/client/client.rc
@@ -1,6 +0,0 @@
-#include <windows.h>
-
-STRINGTABLE
-BEGIN
-	1 "This Program was made using EiffelStudio using Visual Studio C++"
-END
--- a/examples/obsolete/v0/restbucksCRUD/restbucks-safe.ecf
+++ b/examples/obsolete/v0/restbucksCRUD/restbucks-safe.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="restbucks" uuid="2773FEAA-448F-410E-BEDE-9298C4749066" library_target="restbucks">
+<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="restbucks" uuid="2773FEAA-448F-410E-BEDE-9298C4749066">
 	<target name="restbucks_common">
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option full_class_checking="false" void_safety="all">
+		<option  void_safety="all">
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
@@ -29,7 +29,7 @@
 	</target>
 	<target name="restbucks" extends="restbucks_common">
 		<root class="RESTBUCKS_SERVER" feature="make"/>
-		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
+		<option debug="true" warning="true" void_safety="all">
 			<debug name="nino" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
@@ -41,7 +41,7 @@
 	</target>
 	<target name="policy_driven_restbucks" extends="restbucks_common">
 		<root class="RESTBUCKS_SERVER" feature="make"/>
-		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
+		<option debug="true" warning="true" void_safety="all">
 			<debug name="nino" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
--- a/examples/obsolete/v0/restbucksCRUD/restbucks.rc
+++ b/examples/obsolete/v0/restbucksCRUD/restbucks.rc
@@ -1,6 +0,0 @@
-#include <windows.h>
-
-STRINGTABLE
-BEGIN
-	1 "This Program was made using EiffelStudio using Visual Studio C++"
-END
--- a/examples/proxy/proxy.ecf
+++ b/examples/proxy/proxy.ecf
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<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="proxy" uuid="B55F0D95-3793-4C90-BBAC-BF5F2DECD5E6" library_target="proxy">
+<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="proxy" uuid="B55F0D95-3793-4C90-BBAC-BF5F2DECD5E6">
 	<target name="common" abstract="true">
 		<file_rule>
 			<exclude>/.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<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"/>
 		<variable name="ssl_supported" value="false"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>
@@ -18,7 +19,7 @@
 	</target>
 	<target name="proxy" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="scoop"/>
--- a/examples/restbucksCRUD/client/client-safe.ecf
+++ b/examples/restbucksCRUD/client/client-safe.ecf
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="client" uuid="D0059CEB-5F5C-4D21-8C71-842BD0F88468" library_target="client">
+<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="client" uuid="D0059CEB-5F5C-4D21-8C71-842BD0F88468">
 	<target name="client">
 		<root class="RESTBUCK_CLIENT" feature="make"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+		<option warning="true"  void_safety="all">
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="http_client" location="..\..\..\library\network\http_client\http_client-safe.ecf" readonly="false"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json-safe.ecf"/>
-		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/examples/restbucksCRUD/client/client.ecf
+++ b/examples/restbucksCRUD/client/client.ecf
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="client" uuid="D0059CEB-5F5C-4D21-8C71-842BD0F88468">
+<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="client" uuid="D0059CEB-5F5C-4D21-8C71-842BD0F88468">
 	<target name="client">
 		<root class="RESTBUCK_CLIENT" feature="make"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
+		<option warning="true"  void_safety="none">
 		</option>
-		<setting name="concurrency" value="thread"/>
-		<library name="http_client" location="../../../library/network/http_client/http_client.ecf"/>
+		<setting name="concurrency" value="scoop"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="http_client" location="..\..\..\library\network\http_client\http_client.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>
-		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<library name="thread" location="$ISE_LIBRARY/library/thread/thread.ecf"/>
-		<cluster name="src" location="./src" recursive="true"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/examples/restbucksCRUD/restbucks-safe.ecf
+++ b/examples/restbucksCRUD/restbucks-safe.ecf
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="restbucks" uuid="2773FEAA-448F-410E-BEDE-9298C4749066" library_target="restbucks">
+<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="restbucks" uuid="2773FEAA-448F-410E-BEDE-9298C4749066">
 	<target name="restbucks_common">
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option full_class_checking="false" void_safety="all">
+		<option void_safety="all">
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="conneg" location="..\..\library\network\protocol\content_negotiation\conneg-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf" readonly="false"/>
@@ -24,7 +24,7 @@
 	</target>
 	<target name="restbucks" extends="restbucks_common">
 		<root class="RESTBUCKS_SERVER" feature="make"/>
-		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
+		<option debug="true" warning="true" void_safety="all">
 			<debug name="standalone" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
@@ -36,7 +36,7 @@
 	</target>
 	<target name="policy_driven_restbucks" extends="restbucks_common">
 		<root class="RESTBUCKS_SERVER" feature="make"/>
-		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="transitional" syntax="provisional">
+		<option debug="true" warning="true" void_safety="all">
 			<debug name="standalone" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
--- a/examples/restbucksCRUD/restbucks.rc
+++ b/examples/restbucksCRUD/restbucks.rc
@@ -1 +0,0 @@
-
--- a/examples/simple/application_execution.e
+++ b/examples/simple/application_execution.e
@@ -30,8 +30,8 @@ feature -- Basic operations
 			response.set_status_code ({HTTP_STATUS_CODE}.ok)
 			response.header.put_content_type_text_html
 			response.header.put_content_length (s.count)
-			if attached request.http_connection as l_connection and then l_connection.is_case_insensitive_equal_general ("keep-alive") then
-				response.header.put_header_key_value ("Connection", "keep-alive")
+			if request.is_keep_alive_http_connection then
+				response.header.put_connection_keep_alive
 			end
 			response.put_string (s)
 		end
--- a/examples/simple/simple.ecf
+++ b/examples/simple/simple.ecf
@@ -1,31 +1,39 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<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="simple" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486" library_target="simple">
+<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="simple" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="common" abstract="true">
 		<file_rule>
 			<exclude>/.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="transitional" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<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"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
 	</target>
 	<target name="simple_standalone" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option debug="false" warning="true" void_safety="all">
+			<debug name="dbglog" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="scoop"/>
 		<library name="default_standalone" location="..\..\library\server\wsf\default\standalone-safe.ecf"/>
 		<cluster name="simple" location=".\" recursive="true"/>
 	</target>
+	<target name="simple_standalone_mt" extends="simple_standalone">
+		<setting name="concurrency" value="thread"/>
+	</target>
+	<target name="simple_standalone_st" extends="simple_standalone">
+		<setting name="concurrency" value="none"/>
+	</target>
 	<target name="simple_cgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_cgi" location="..\..\library\server\wsf\default\cgi-safe.ecf"/>
@@ -33,12 +41,10 @@
 	</target>
 	<target name="simple_libfcgi" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="default_libfcgi" location="..\..\library\server\wsf\default\libfcgi-safe.ecf"/>
 		<cluster name="simple" location=".\" recursive="true"/>
 	</target>
-	<target name="simple" extends="simple_standalone">
-	</target>
 </system>
--- a/examples/simple/simple.ini
+++ b/examples/simple/simple.ini
@@ -2,7 +2,8 @@ verbose=true
 verbose_level=ALERT
 port=9090
 #max_concurrent_connections=100
-#keep_alive_timeout=15
+keep_alive_timeout=3
 #max_tcp_clients=100
-#socket_timeout=300
+socket_timeout=60
+socket_recv_timeout=15
 #max_keep_alive_requests=300
--- a/examples/simple/simple.rc
+++ b/examples/simple/simple.rc
@@ -1 +0,0 @@
-
--- a/examples/simple_file/service.ini
+++ b/examples/simple_file/service.ini
@@ -0,0 +1,4 @@
+port=9090
+verbose=true
+socket_recv_timeout=15
+keep_alive_timeout=30
--- a/examples/simple_file/service_file.e
+++ b/examples/simple_file/service_file.e
@@ -21,6 +21,7 @@ feature {NONE} -- Initialization
 		do
 			Precursor
 			set_service_option ("port", 9090)
+			import_service_options (create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI}.make_from_file ("service.ini"))
 		end

 end
--- a/examples/simple_file/service_file.ecf
+++ b/examples/simple_file/service_file.ecf
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="service_file" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
+<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="service_file" uuid="C28C4F53-9963-46C0-A080-8F13E94E7486">
 	<target name="service_file">
 		<root class="SERVICE_FILE" feature="make_and_launch"/>
-		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="transitional" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
@@ -12,9 +12,9 @@
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
 		<cluster name="service_file" location=".\" recursive="true">
 			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
 				<exclude>/.svn$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/EIFGENs$</exclude>
 			</file_rule>
 		</cluster>
 	</target>
--- a/examples/simple_file/service_file.rc
+++ b/examples/simple_file/service_file.rc
@@ -1 +0,0 @@
-
--- a/examples/simple_ssl/application.e
+++ b/examples/simple_ssl/application.e
@@ -1,13 +1,13 @@
 note
-	description : "simple application root class"
-	date        : "$Date$"
-	revision    : "$Revision$"
+	description: "simple application root class"
+	date: "$Date$"
+	revision: "$Revision$"

 class
 	APPLICATION

 inherit
-	WSF_DEFAULT_SERVICE [APPLICATION_EXECUTION]
+	WSF_STANDALONE_SERVICE [APPLICATION_EXECUTION]
 		redefine
 			initialize
 		end
@@ -19,11 +19,17 @@ feature {NONE} -- Initialization

 	initialize
 			-- Initialize current service.
+		local
+			opts: WSF_STANDALONE_SERVICE_OPTIONS
 		do
 				-- Specific to `standalone' connector (the EiffelWeb server).
 				-- See `{WSF_STANDALONE_SERVICE_LAUNCHER}.initialize'
- 			set_service_option ("port", 9090)
- 			import_service_options (create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI}.make_from_file ("simple.ini"))
+			create opts
+			opts.port := 9090
+			opts.socket_recv_timeout := 5 -- seconds
+
+			opts.import_ini_file_options ("simple.ini")
+			import_service_options (opts)
 		end

 end
--- a/examples/simple_ssl/application_execution.e
+++ b/examples/simple_ssl/application_execution.e
@@ -32,8 +32,8 @@ feature -- Basic operations
 			response.set_status_code ({HTTP_STATUS_CODE}.ok)
 			response.header.put_content_type_text_html
 			response.header.put_content_length (s.count)
-			if attached request.http_connection as l_connection and then l_connection.is_case_insensitive_equal_general ("keep-alive") then
-				response.header.put_header_key_value ("Connection", "keep-alive")
+			if request.is_keep_alive_http_connection then
+				response.header.put_connection_keep_alive
 			end
 			response.put_string (s)
 		end
--- a/examples/simple_ssl/simple.crt
+++ b/examples/simple_ssl/simple.crt
--- a/examples/simple_ssl/simple.key
+++ b/examples/simple_ssl/simple.key
--- a/examples/simple_ssl/simple.ini
+++ b/examples/simple_ssl/simple.ini
@@ -17,11 +17,11 @@ port=9090
 #keep_alive_timeout=15
 #max_keep_alive_requests=100

-### SSL settings
+### Secure connection settings
 # enable SSL, with file certificate.
-ssl_enabled=true
-ssl_ca_key=simple.key
-ssl_ca_crt=simple.crt
+is_secure=true
+secure_certificate=ca.crt
+secure_certificate_key=ca.key

 ### App settings
 verbose=true
--- a/examples/simple_ssl/simple_ssl.ecf
+++ b/examples/simple_ssl/simple_ssl.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<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="simple_ssl" uuid="C2FE296C-3C18-4609-A5AB-F604BDEE4410" library_target="simple_ssl">
+<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="simple_ssl" uuid="C2FE296C-3C18-4609-A5AB-F604BDEE4410">
 	<target name="simple_ssl">
 		<description>Simple EiffelWeb standalone server with SSL support (Concurrent connection supported thanks to SCOOP).</description>
 		<root class="APPLICATION" feature="make_and_launch"/>
@@ -8,16 +8,16 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions/>
 		</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"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
+		<library name="wsf_standalone" location="..\..\library\server\wsf\connector\standalone-safe.ecf"/>
 		<cluster name="simple" location=".\" recursive="true"/>
 	</target>
 	<target name="simple_ssl_st" extends="simple_ssl">
--- a/examples/tutorial/step_2/hello/alternatives/launcher/hello_application.e
+++ b/examples/tutorial/step_2/hello/alternatives/launcher/hello_application.e
@@ -22,13 +22,10 @@ create
 feature {NONE} -- Initialization

 	initialize
-		local
-			opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS
 		do
 			Precursor
-				--| Uncomment the following 2 lines, to read options from "ewf.ini" configuration file
--			create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} opts.make_from_file ("ewf.ini")
--			import_service_options (opts)
+				--| Uncomment the following line, to read options from "ewf.ini" configuration file
+--			import_service_options (create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} opts.make_from_file ("ewf.ini"))
 		end

 	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
--- a/examples/tutorial/step_2/hello/alternatives/launcher/hello_with_launcher.ecf
+++ b/examples/tutorial/step_2/hello/alternatives/launcher/hello_with_launcher.ecf
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="hello_with_launcher" uuid="00871FE9-7114-4A09-BF4F-C0B833D4F1CB">
-
+<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="hello_with_launcher" uuid="00871FE9-7114-4A09-BF4F-C0B833D4F1CB">
 	<target name="hello_with_launcher">
-		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
 		<root class="HELLO_APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<file_rule>
+			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
+		</file_rule>
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
 		<library name="default_standalone" location="..\..\..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
+		<library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
 		<cluster name="src" location=".\"/>
 	</target>
-
 </system>
--- a/examples/tutorial/step_2/hello/alternatives/message/hello_with_execute.ecf
+++ b/examples/tutorial/step_2/hello/alternatives/message/hello_with_execute.ecf
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="hello_with_execute" uuid="DB6E98D3-64A9-4FF6-8F11-9E626DCAED6D">
-
+<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="hello_with_execute" uuid="DB6E98D3-64A9-4FF6-8F11-9E626DCAED6D">
 	<target name="hello_with_execute">
-		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
 		<root class="HELLO_APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<file_rule>
+			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
+		</file_rule>
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
 		<library name="default_standalone" location="..\..\..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
-		<cluster name="src" location=".\" />
+		<library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
+		<cluster name="src" location=".\"/>
 	</target>
-
 </system>
--- a/examples/tutorial/step_2/hello/hello.ecf
+++ b/examples/tutorial/step_2/hello/hello.ecf
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="hello" uuid="25B014D9-CC71-484D-93D9-5E93B51C6B36">
+<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="hello" uuid="25B014D9-CC71-484D-93D9-5E93B51C6B36">
 	<target name="hello">
 		<root class="HELLO_APPLICATION" feature="make_and_launch"/>
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<precompile name="precomp_wsf" location="..\..\..\..\precomp\wsf-safe.ecf"/>
@@ -19,11 +19,11 @@
 	<target name="hello_mt">
 		<root class="HELLO_APPLICATION" feature="make_and_launch"/>
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
--- a/examples/tutorial/step_3/hello/hello.ecf
+++ b/examples/tutorial/step_3/hello/hello.ecf
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="hello" uuid="088E8D53-3705-4362-B04D-8EDF0DBE50E5">
-
+<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="hello" uuid="088E8D53-3705-4362-B04D-8EDF0DBE50E5">
 	<target name="hello">
-		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
-			<exclude>/.svn$</exclude>
-		</file_rule>
 		<root class="HELLO_APPLICATION" feature="make_and_launch"/>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<file_rule>
+			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
+		</file_rule>
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<precompile name="precomp_wsf-mt" location="..\..\..\..\precomp\wsf-mt-safe.ecf"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="wsf" location="..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
 		<library name="default_standalone" location="..\..\..\..\library\server\wsf\default\standalone-safe.ecf"/>
-		<cluster name="src" location=".\src" recursive="true"/>
+		<library name="wsf" location="..\..\..\..\library\server\wsf\wsf-safe.ecf"/>
+		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
-
 </system>
--- a/examples/tutorial/step_4/hello/hello.ecf
+++ b/examples/tutorial/step_4/hello/hello.ecf
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-10-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-10-0 http://www.eiffel.com/developers/xml/configuration-1-10-0.xsd" name="hello" uuid="5F5ED8A1-AD1C-41BD-878A-BE45A9B28739">
+<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="hello" uuid="5F5ED8A1-AD1C-41BD-878A-BE45A9B28739">
 	<target name="hello">
 		<root class="HELLO_APPLICATION" feature="make_and_launch"/>
 		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<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="encoder" location="..\..\..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
+		<library name="http" location="..\..\..\..\library\network\protocol\http\http-safe.ecf" readonly="false"/>
 		<library name="wsf" location="..\..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
-		<library name="http" location="../../../../library/network/protocol/http/http-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
--- a/examples/upload_image/upload_image-safe.ecf
+++ b/examples/upload_image/upload_image-safe.ecf
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="upload_image" uuid="F2400BE8-D8EB-48EB-B4E4-5D4377062A7F" library_target="upload_image">
+<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="upload_image" uuid="F2400BE8-D8EB-48EB-B4E4-5D4377062A7F">
 	<target name="upload_image_common">
 		<file_rule>
 			<exclude>/EIFGENs$</exclude>
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option debug="true" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
+		<option debug="true" warning="true"  void_safety="all">
 			<debug name="standalone" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" supplier_precondition="true"/>
 		</option>
@@ -14,7 +14,6 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf" readonly="false"/>
-		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
 		<library name="uri_template" location="..\..\library\text\parser\uri_template\uri_template-safe.ecf" readonly="false"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf" readonly="false" use_application_options="true"/>
 	</target>
@@ -34,5 +33,6 @@
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
 	<target name="upload_image" extends="upload_image_standalone">
+		<setting name="concurrency" value="scoop"/>
 	</target>
 </system>
--- a/examples/websocket/application.e
+++ b/examples/websocket/application.e
@@ -14,16 +14,18 @@ feature {NONE} -- Initialization
 	make_and_launch
 		local
 			l_launcher: WSF_STANDALONE_WEBSOCKET_SERVICE_LAUNCHER [APPLICATION_EXECUTION]
-			opts: WSF_SERVICE_LAUNCHER_OPTIONS
+			opts: WSF_STANDALONE_WEBSOCKET_SERVICE_OPTIONS
 		do
-			create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} opts.make_from_file ("ws.ini")
-			create l_launcher.make_and_launch (options)
-		end
+			create opts
+			if opts.is_secure_connection_supported then
+				opts.is_secure := True
+				opts.set_secure_protocol_to_tls_1_2
+				opts.secure_certificate := "ca.crt"
+				opts.secure_certificate_key := "ca.key"
+			end

-	options: WSF_SERVICE_LAUNCHER_OPTIONS
-			-- Initialize current service.
-		do
-			create {WSF_SERVICE_LAUNCHER_OPTIONS_FROM_INI} Result.make_from_file ("ws.ini")
+			opts.import_ini_file_options ("ws.ini")
+			create l_launcher.make_and_launch (opts)
 		end

 end
--- a/examples/websocket/application_execution.e
+++ b/examples/websocket/application_execution.e
@@ -35,8 +35,8 @@ feature -- Basic operations
 			response.set_status_code ({HTTP_STATUS_CODE}.ok)
 			response.header.put_content_type_text_html
 			response.header.put_content_length (s.count)
-			if attached request.http_connection as l_connection and then l_connection.is_case_insensitive_equal_general ("keep-alive") then
-				response.header.put_header_key_value ("Connection", "keep-alive")
+			if request.is_keep_alive_http_connection then
+				response.header.put_connection_keep_alive
 			end
 			response.put_string (s)
 		end
@@ -88,7 +88,7 @@ feature -- HTML Resource
 <!DOCTYPE html>
 <html>
 <head>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+<script src="##HTTPSCHEME##://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {

@@ -96,9 +96,10 @@ $(document).ready(function() {

 	function connect(){

-			var host = "ws://127.0.0.1:##PORTNUMBER##";
+			var host = "##WSSCHEME##://127.0.0.1:##PORTNUMBER##/app";

 			try{
+
 				socket = new WebSocket(host);
 				message('<p class="event">Socket Status: '+socket.readyState);
 				socket.onopen = function(){
@@ -178,6 +179,13 @@ body {font-family:Arial, Helvetica, sans-serif;}
 </html>
 			]"
 			Result.replace_substring_all ("##PORTNUMBER##", a_port.out)
+			if request.is_https then
+				Result.replace_substring_all ("##HTTPSCHEME##", "https")
+				Result.replace_substring_all ("##WSSCHEME##", "wss")
+			else
+				Result.replace_substring_all ("##HTTPSCHEME##", "http")
+				Result.replace_substring_all ("##WSSCHEME##", "ws")
+			end
 		end


--- a/examples/websocket/ca.crt
+++ b/examples/websocket/ca.crt
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICWDCCAcGgAwIBAgIJAJnXGtV+PtiYMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQwHhcNMTUwNDAzMjIxNTA0WhcNMTYwNDAyMjIxNTA0WjBF
+MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
+ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQDFMK6ojzg+KlklhTossR13c51izMgGc3B0z9ttfHIcx2kxra3HtHcKIl5wSUvn
+G8zmSyFAyQTs5LUv65q46FM9qU8tP+vTeFCfNXvjRcIEpouta3J53K0xuUlxz4d4
+4D6qvdDWAez/0AkI4y5etW5zXtg7IQorJhsI9TmfGuruzwIDAQABo1AwTjAdBgNV
+HQ4EFgQUbWpk2HoHa0YqpEwr7CGEatBFTMkwHwYDVR0jBBgwFoAUbWpk2HoHa0Yq
+pEwr7CGEatBFTMkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAi+h4/
+IgEocWkdRZBKHEcTrRxz5WhEDJMoVo9LhnXvCfn1G/4p6Un6sYv7Xzpi9NuSY8uV
+cjfJJXhtF3AtyZ70iTAxWaRWjGaZ03PYOjlledJ5rqJEt6CCn8m+JsfznduZvbxQ
+zQ6jCLXfyD/tvemB+yYEI3NntvRKx5/zt6Q26Q==
+-----END CERTIFICATE-----
--- a/examples/websocket/ca.key
+++ b/examples/websocket/ca.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDFMK6ojzg+KlklhTossR13c51izMgGc3B0z9ttfHIcx2kxra3H
+tHcKIl5wSUvnG8zmSyFAyQTs5LUv65q46FM9qU8tP+vTeFCfNXvjRcIEpouta3J5
+3K0xuUlxz4d44D6qvdDWAez/0AkI4y5etW5zXtg7IQorJhsI9TmfGuruzwIDAQAB
+AoGAR5efMg+dieRyLU8rieJcImxVbfOPg9gRsjdtIVkXTR+RL7ow59q7hXBo/Td/
+WU8cm1gXoJ/bK+71YYqWyB+BaLRIWvRWb7Gdw203tu4e136Ca5uuY+71qdbVTVcl
+NQ7J+T+eAQFP+a+DdT3ZQxu9eze87SMbu6i5YSpIk2kusOECQQDunv/DQ+nc+NgR
+DF+Td3sNYUVRT9a1CWi6abAG6reXwp8MS4NobWDf+Ps4JODhEEwlIdq5qL7qqYBZ
+Gc1TJJ53AkEA0404Fn6vAzzegBcS4RLlYTK7nMr0m4pMmDMCI6YzAYdMmKHp1e6f
+IwxSmQrmwyAgwcT01bc0+A8yipcC2BWQaQJBAJ01QZm635OGmos41KsKF5bsE8gL
+SpBBH69Yu/ECqGwie7iU84FUNnO4zIHjwghlPVVlZX3Vz9o4S+fn2N9DC+cCQGyZ
+QyCxGdC0r5fbwHJQS/ZQn+UGfvlVzqoXDVMVn3t6ZES6YZrT61eHnOM5qGqklIxE
+Old3vDZXPt/MU8Zvk3kCQBOgUx2VxvTrHN37hk9/QIDiM62+RenBm1M3ah8xTosf
+1mSeEb6d9Kwb3TgPBmA7YXzJuAQfRIvEPMPxT5SSr6Q=
+-----END RSA PRIVATE KEY-----
--- a/examples/websocket/websocket_app.ecf
+++ b/examples/websocket/websocket_app.ecf
@@ -7,7 +7,7 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all" syntax="transitional">
+		<option warning="true" void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
@@ -18,4 +18,7 @@
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
 		<cluster name="app" location=".\" recursive="true"/>
 	</target>
+	<target name="websocket_app_ssl" extends="websocket_app">
+		<variable name="ssl_enabled" value="true"/>
+	</target>
 </system>
--- a/examples/websocket/ws.ini
+++ b/examples/websocket/ws.ini
@@ -4,5 +4,10 @@ port=9090
 max_concurrent_connections=100
 keep_alive_timeout=35
 max_tcp_clients=100
-socket_timeout=30000
-max_keep_alive_requests=3000
+socket_timeout=30
+socket_recv_timeout=5
+max_keep_alive_requests=300
+
+is_secure=false
+secure_certificate=ca.crt
+secure_certificate_key=ca.key
--- a/library/network/http_client/http_client-safe.ecf
+++ b/library/network/http_client/http_client-safe.ecf
@@ -7,8 +7,9 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option debug="false" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
+		<option debug="false" warning="true" void_safety="all">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf">
 			<condition>
@@ -18,12 +19,17 @@
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
 		<library name="http" location="..\protocol\http\http-safe.ecf"/>
 		<library name="http_auth" location="..\..\server\authentication\http_authorization\http_authorization-safe.ecf"/>
+		<library name="http_network" location="..\http_network\http_network-safe.ecf"/>
 		<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="net_http_client_disabled" excluded_value="true"/>
 				<custom name="netssl_http_client_enabled" value="true"/>
 			</condition>
+			<condition>
+				<custom name="net_http_client_disabled" excluded_value="true"/>
+				<custom name="ssl_enabled" value="true"/>
+			</condition>
 		</library>
 		<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri-safe.ecf"/>
 		<cluster name="src" location=".\src\">
@@ -37,18 +43,6 @@
 						<custom name="net_http_client_disabled" excluded_value="true"/>
 					</condition>
 				</cluster>
-				<cluster name="net_ssl_disabled" location="$|no_ssl\">
-					<condition>
-						<custom name="net_http_client_disabled" excluded_value="true"/>
-						<custom name="netssl_http_client_enabled" excluded_value="true"/>
-					</condition>
-				</cluster>
-				<cluster name="net_ssl_enabled" location="$|ssl\">
-					<condition>
-						<custom name="net_http_client_disabled" excluded_value="true"/>
-						<custom name="netssl_http_client_enabled" value="true"/>
-					</condition>
-				</cluster>
 			</cluster>
 			<cluster name="spec_libcurl" location="$|spec\libcurl\" recursive="true">
 				<condition>
--- a/library/network/http_client/http_client.ecf
+++ b/library/network/http_client/http_client.ecf
@@ -7,8 +7,9 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
+		<option warning="true" void_safety="none">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL.ecf">
 			<condition>
@@ -18,12 +19,17 @@
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
 		<library name="http" location="..\protocol\http\http.ecf"/>
 		<library name="http_auth" location="..\..\server\authentication\http_authorization\http_authorization.ecf"/>
+		<library name="http_network" location="..\http_network\http_network.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">
 			<condition>
 				<custom name="net_http_client_disabled" excluded_value="true"/>
 				<custom name="netssl_http_client_enabled" value="true"/>
 			</condition>
+			<condition>
+				<custom name="net_http_client_disabled" excluded_value="true"/>
+				<custom name="ssl_enabled" value="true"/>
+			</condition>
 		</library>
 		<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/>
 		<cluster name="src" location=".\src\">
@@ -37,18 +43,6 @@
 						<custom name="net_http_client_disabled" excluded_value="true"/>
 					</condition>
 				</cluster>
-				<cluster name="net_ssl_disabled" location="$|no_ssl\">
-					<condition>
-						<custom name="net_http_client_disabled" excluded_value="true"/>
-						<custom name="netssl_http_client_enabled" excluded_value="true"/>
-					</condition>
-				</cluster>
-				<cluster name="net_ssl_enabled" location="$|ssl\">
-					<condition>
-						<custom name="net_http_client_disabled" excluded_value="true"/>
-						<custom name="netssl_http_client_enabled" value="true"/>
-					</condition>
-				</cluster>
 			</cluster>
 			<cluster name="spec_libcurl" location="$|spec\libcurl\" recursive="true">
 				<condition>
--- a/library/network/http_client/libcurl_http_client-safe.ecf
+++ b/library/network/http_client/libcurl_http_client-safe.ecf
@@ -7,8 +7,9 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option debug="false" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
+		<option debug="false" warning="true" void_safety="all">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
--- a/library/network/http_client/libcurl_http_client.ecf
+++ b/library/network/http_client/libcurl_http_client.ecf
@@ -7,8 +7,9 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option debug="false" warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
+		<option debug="false" warning="true" void_safety="none">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
--- a/library/network/http_client/net_http_client-safe.ecf
+++ b/library/network/http_client/net_http_client-safe.ecf
@@ -7,14 +7,19 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option debug="false" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
+		<option debug="false" warning="true" void_safety="all">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
 		<library name="http" location="..\protocol\http\http-safe.ecf"/>
 		<library name="http_auth" location="..\..\server\authentication\http_authorization\http_authorization-safe.ecf"/>
+		<library name="http_network" location="..\http_network\http_network-safe.ecf"/>
 		<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="ssl_enabled" value="true"/>
+			</condition>
 			<condition>
 				<custom name="netssl_http_client_enabled" value="true"/>
 			</condition>
@@ -23,16 +28,6 @@
 		<cluster name="src" location=".\src\">
 			<cluster name="spec_net" location="$|spec\net\">
 				<cluster name="net_implementation" location="$|implementation\" hidden="true"/>
-				<cluster name="net_ssl_disabled" location="$|no_ssl\">
-					<condition>
-						<custom name="netssl_http_client_enabled" excluded_value="true"/>
-					</condition>
-				</cluster>
-				<cluster name="net_ssl_enabled" location="$|ssl\">
-					<condition>
-						<custom name="netssl_http_client_enabled" value="true"/>
-					</condition>
-				</cluster>
 			</cluster>
 			<cluster name="default_net" location="$|default\net\"/>
 		</cluster>
--- a/library/network/http_client/net_http_client.ecf
+++ b/library/network/http_client/net_http_client.ecf
@@ -7,14 +7,19 @@
 			<exclude>/.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option debug="false" warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
+		<option debug="false" warning="true" void_safety="none">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
 		<library name="http" location="..\protocol\http\http.ecf"/>
 		<library name="http_auth" location="..\..\server\authentication\http_authorization\http_authorization.ecf"/>
+		<library name="http_network" location="..\http_network\http_network.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">
+			<condition>
+				<custom name="ssl_enabled" value="true"/>
+			</condition>
 			<condition>
 				<custom name="netssl_http_client_enabled" value="true"/>
 			</condition>
@@ -23,16 +28,6 @@
 		<cluster name="src" location=".\src\">
 			<cluster name="spec_net" location="$|spec\net\">
 				<cluster name="net_implementation" location="$|implementation\" hidden="true"/>
-				<cluster name="net_ssl_disabled" location="$|no_ssl\">
-					<condition>
-						<custom name="netssl_http_client_enabled" excluded_value="true"/>
-					</condition>
-				</cluster>
-				<cluster name="net_ssl_enabled" location="$|ssl\">
-					<condition>
-						<custom name="netssl_http_client_enabled" value="true"/>
-					</condition>
-				</cluster>
 			</cluster>
 			<cluster name="default_net" location="$|default\net\"/>
 		</cluster>
--- a/library/network/http_client/src/http_client_request.e
+++ b/library/network/http_client/src/http_client_request.e
@@ -164,11 +164,24 @@ feature -- Settings
 			Result := session.ignore_content_length
 		end

-	buffer_size: NATURAL
-			-- Set the buffer size for request. This option will
-			-- only be set if buffer_size is positive
+	buffer_size: INTEGER
+			-- Buffer size for request,
+			-- initialized from the session buffer_size value, or default 2_048.
 		do
-			Result := session.buffer_size
+			Result := session.buffer_size.to_integer_32
+			if Result <= 0 then
+				Result := 2_048
+			end
+		end
+
+	chunk_size: INTEGER
+			-- Chunk size for request, when "Transfer-Encoding: chunked"
+			-- initialized from the session buffer_size value, or default 2_048.
+		do
+			Result := session.chunk_size.to_integer_32
+			if Result <= 0 then
+				Result := 2_048
+			end
 		end

 	default_response_charset: detachable READABLE_STRING_8
@@ -249,7 +262,7 @@ feature {NONE} -- Utilities: encoding
 		end

 note
-	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/network/http_client/src/http_client_session.e
+++ b/library/network/http_client/src/http_client_session.e
@@ -243,9 +243,13 @@ feature -- Settings
 	ignore_content_length: BOOLEAN
 			-- Does this session ignore Content-Size headers?

-	buffer_size: NATURAL
+	buffer_size: NATURAL assign set_buffer_size
 			-- Set the buffer size for request. This option will
-			-- only be set if buffer_size is positive
+			-- only be set if buffer_size > 0.
+
+	chunk_size: NATURAL assign set_chunk_size
+			-- Set the chunk size for request, when "Transfer-Encoding: chunked".
+			-- This option will only be set if chunk_size > 0.

 	default_response_charset: detachable READABLE_STRING_8
 			-- Default encoding of responses. Used if no charset is provided by the host.
@@ -405,8 +409,18 @@ feature -- Element change
 			end
 		end

+	set_buffer_size (a_size: like buffer_size)
+		do
+			buffer_size := a_size
+		end
+
+	set_chunk_size (a_size: like chunk_size)
+		do
+			chunk_size := a_size
+		end
+
 note
-	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/network/http_client/src/spec/net/implementation/net_http_client_connection.e
+++ b/library/network/http_client/src/spec/net/implementation/net_http_client_connection.e
@@ -11,7 +11,7 @@ create

 feature {NONE} -- Initialization

-	make (a_socket: NETWORK_STREAM_SOCKET; a_host: READABLE_STRING_GENERAL; a_port: INTEGER)
+	make (a_socket: HTTP_STREAM_SOCKET; a_host: READABLE_STRING_GENERAL; a_port: INTEGER)
 		do
 			socket := a_socket
 			host := a_host
@@ -20,7 +20,7 @@ feature {NONE} -- Initialization

 feature -- Access

-	socket: NETWORK_STREAM_SOCKET
+	socket: HTTP_STREAM_SOCKET
 			-- Persistent connection socket.

 	host: READABLE_STRING_GENERAL
@@ -40,7 +40,7 @@ feature -- Status report
 		end

 note
-	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/network/http_client/src/spec/net/net_http_client_request.e
+++ b/library/network/http_client/src/spec/net/net_http_client_request.e
@@ -28,11 +28,11 @@ feature {NONE} -- Internal
 	session: NET_HTTP_CLIENT_SESSION
 	net_http_client_version: STRING = "0.1"

-	session_socket (a_host: READABLE_STRING_8; a_port: INTEGER; a_is_https: BOOLEAN; ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT): NETWORK_STREAM_SOCKET
+	session_socket (a_host: READABLE_STRING_8; a_port: INTEGER; a_is_https: BOOLEAN; ctx: detachable HTTP_CLIENT_REQUEST_CONTEXT): HTTP_STREAM_SOCKET
 			-- Session socket to use for connection.
 			-- Eventually reuse the persistent connection if any.
 		local
-			l_socket: detachable NETWORK_STREAM_SOCKET
+			l_socket: detachable HTTP_STREAM_SOCKET
 		do
 			if
 				attached session.persistent_connection as l_persistent_connection and then
@@ -40,12 +40,12 @@ feature {NONE} -- Internal
 			then
 				l_socket := l_persistent_connection.socket
 				if a_is_https then
-					if attached {SSL_NETWORK_STREAM_SOCKET} l_socket as l_ssl_socket then
+					if attached {HTTP_STREAM_SECURE_SOCKET} l_socket as l_ssl_socket then
 						Result := l_ssl_socket
 					else
 						l_socket := Void
 					end
-				elseif attached {SSL_NETWORK_STREAM_SOCKET} l_socket as l_ssl_socket then
+				elseif attached {HTTP_STREAM_SECURE_SOCKET} l_socket as l_ssl_socket then
 					l_socket := Void
 				end
 				if l_socket /= Void and then not l_socket.is_connected then
@@ -59,7 +59,7 @@ feature {NONE} -- Internal
 			else
 				session.set_persistent_connection (Void)
 				if a_is_https then
-					create {SSL_NETWORK_STREAM_SOCKET} Result.make_client_by_port (a_port, a_host)
+					create {HTTP_STREAM_SECURE_SOCKET} Result.make_client_by_port (a_port, a_host)
 				else
 					create Result.make_client_by_port (a_port, a_host)
 				end
@@ -81,7 +81,7 @@ feature -- Access
 			l_cookie: detachable READABLE_STRING_8
 			l_request_uri: STRING
 			l_url: HTTP_URL
-			l_socket: NETWORK_STREAM_SOCKET
+			l_socket: HTTP_STREAM_SOCKET
 			s: STRING
 			l_message: STRING
 			l_content_length: INTEGER
@@ -100,6 +100,7 @@ feature -- Access
 			l_boundary: READABLE_STRING_8
 			l_is_http_1_0_request: BOOLEAN
 			l_is_keep_alive: BOOLEAN
+			l_is_chunked_transfer_encoding: BOOLEAN
 			retried: BOOLEAN
 		do
 			if not retried then
@@ -179,6 +180,8 @@ feature -- Access
 					end

 						-- handle sending data
+					l_is_chunked_transfer_encoding := attached headers.item ("Transfer-Encoding") as l_transfer_encoding and then l_transfer_encoding.same_string ("chunked")
+
 					if ctx /= Void then
 						if ctx.has_upload_filename then
 							l_upload_filename := ctx.upload_filename
@@ -195,14 +198,21 @@ feature -- Access
 								headers.extend ("application/x-www-form-urlencoded", "Content-Type")
 								l_upload_data := ctx.form_parameters_to_url_encoded_string
 								headers.force (l_upload_data.count.out, "Content-Length")
-
-							else
+								if l_is_chunked_transfer_encoding then
+										-- Discard chunked transfer encoding
+									headers.remove ("Transfer-Encoding")
+									l_is_chunked_transfer_encoding := False
+								end
+							elseif l_form_data /= Void then
 									-- create form using multipart/form-data encoding
-								l_boundary := new_mime_boundary
+								l_boundary := new_mime_boundary (l_form_data)
 								headers.extend ("multipart/form-data; boundary=" + l_boundary, "Content-Type")
-								if l_form_data /= Void then
-									l_upload_data := form_date_and_uploaded_files_to_mime_string (l_form_data, l_upload_filename, l_boundary)
-									headers.extend (l_upload_data.count.out, "Content-Length")
+								l_upload_data := form_date_and_uploaded_files_to_mime_string (l_form_data, l_upload_filename, l_boundary)
+								headers.extend (l_upload_data.count.out, "Content-Length")
+								if l_is_chunked_transfer_encoding then
+										-- Discard chunked transfer encoding
+									headers.remove ("Transfer-Encoding")
+									l_is_chunked_transfer_encoding := False
 								end
 							end
 						elseif l_upload_data /= Void then
@@ -210,12 +220,16 @@ feature -- Access
 							if not headers.has ("Content-Type") then
 								headers.extend ("application/x-www-form-urlencoded", "Content-Type")
 							end
-							headers.extend (l_upload_data.count.out, "Content-Length")
+							if not l_is_chunked_transfer_encoding then
+								headers.extend (l_upload_data.count.out, "Content-Length")
+							end
 						elseif l_upload_filename /= Void then
 							check ctx.has_upload_filename end
 							create l_upload_file.make_with_name (l_upload_filename)
 							if l_upload_file.exists and then l_upload_file.readable then
-								headers.extend (l_upload_file.count.out, "Content-Length")
+								if not l_is_chunked_transfer_encoding then
+									headers.extend (l_upload_file.count.out, "Content-Length")
+								end
 							end
 							check l_upload_file /= Void end
 						end
@@ -289,12 +303,7 @@ feature -- Access
 						--| End of client header.
 					s.append (Http_end_of_header_line)

-					if l_upload_data /= Void then
-						s.append (l_upload_data)
-						s.append (http_end_of_header_line)
-					end
-
-						--| Note that any remaining file to upload will be done directly via the socket
+						--| Note that any remaining data or file to upload will be done directly via the socket
 						--| to optimize memory usage


@@ -315,9 +324,20 @@ feature -- Access
 						end
 						l_socket.put_string (s)
 							--| Send remaining payload data, if needed.
+						if l_upload_data /= Void then
+							if l_is_chunked_transfer_encoding then
+								put_string_using_chunked_transfer_encoding (l_upload_data, chunk_size, l_socket)
+							else
+								l_socket.put_string (l_upload_data)
+							end
+						end
 						if l_upload_file /= Void then
-								-- i.e: not yet processed
-							append_file_content_to_socket (l_upload_file, l_upload_file.count, l_socket)
+							if l_is_chunked_transfer_encoding then
+									-- i.e: not yet processed
+								append_file_content_to_socket_using_chunked_transfer_encoding (l_upload_file, l_upload_file.count, chunk_size, l_socket)
+							else
+								append_file_content_to_socket (l_upload_file, l_upload_file.count, l_socket)
+							end
 						end

 							--|-------------------------|--
@@ -418,7 +438,7 @@ feature {NONE} -- Helpers
 			io.error.put_string (m)
 		end

-	is_ready_for_reading (a_socket: NETWORK_STREAM_SOCKET): BOOLEAN
+	is_ready_for_reading (a_socket: HTTP_STREAM_SOCKET): BOOLEAN
 			-- Is `a_socket' ready for reading?
 		do
 			Result := a_socket.ready_for_reading
@@ -498,8 +518,85 @@ feature {NONE} -- Helpers
 			Result := utf.utf_32_string_to_utf_8_string_8 (s)
 		end

-	append_file_content_to_socket (a_file: FILE; a_len: INTEGER; a_output: NETWORK_STREAM_SOCKET)
-			-- Append `a_file' content to `a_output'.
+	put_string_using_chunked_transfer_encoding (a_string: READABLE_STRING_8; a_chunk_size: INTEGER; a_output: HTTP_STREAM_SOCKET)
+		local
+			i,n: INTEGER
+		do
+			from
+				i := 1
+				n := a_string.count
+			until
+				i > n
+			loop
+				put_chunk (a_string.substring (i, i + a_chunk_size), Void, a_output)
+				i := i + a_chunk_size
+			end
+			put_chunk_end (Void, Void, a_output)
+		end
+
+	put_chunk (a_content: READABLE_STRING_8; a_ext: detachable READABLE_STRING_8; a_output: HTTP_STREAM_SOCKET)
+			-- Write chunk non empty `a_content' to `a_output'
+			-- with optional extension `a_ext': chunk-extension= *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
+			-- Note: that header "Transfer-Encoding: chunked" is required.
+		require
+			a_content_not_empty: a_content /= Void and then not a_content.is_empty
+			valid_chunk_extension: (a_ext /= Void and then not a_ext.is_empty) implies
+						( a_ext.starts_with (";") and not a_ext.has ('%N') and not not a_ext.has ('%R') )
+		local
+			l_chunk_size_line: STRING_8
+			i: INTEGER
+		do
+				--| Remove all left '0'
+			l_chunk_size_line := a_content.count.to_hex_string
+			from
+				i := 1
+			until
+				l_chunk_size_line[i] /= '0'
+			loop
+				i := i + 1
+			end
+			if i > 1 then
+				l_chunk_size_line := l_chunk_size_line.substring (i, l_chunk_size_line.count)
+			end
+
+			if a_ext /= Void then
+				l_chunk_size_line.append (a_ext)
+			end
+			l_chunk_size_line.append (crlf)
+
+			a_output.put_string (l_chunk_size_line)
+			a_output.put_string (a_content)
+			a_output.put_string (crlf)
+		end
+
+	put_chunk_end (a_ext: detachable READABLE_STRING_8; a_trailer: detachable READABLE_STRING_8; a_output: HTTP_STREAM_SOCKET)
+			-- Put end of chunked content,
+			-- with optional extension `a_ext': chunk-extension= *( ";" chunk-ext-name [ "=" chunk-ext-val ] )
+			-- and with optional trailer `a_trailer' : trailer= *(entity-header CRLF)
+		local
+			l_chunk_size_line: STRING_8
+		do
+			-- Chunk end
+			create l_chunk_size_line.make (1)
+			l_chunk_size_line.append_integer (0)
+
+			if a_ext /= Void then
+				l_chunk_size_line.append (a_ext)
+			end
+			l_chunk_size_line.append (crlf)
+			a_output.put_string (l_chunk_size_line)
+
+				-- Optional trailer
+			if a_trailer /= Void and then not a_trailer.is_empty then
+				a_output.put_string (a_trailer)
+			end
+
+				-- Final CRLF
+			a_output.put_string (crlf)
+		end
+
+	append_file_content_to_socket_using_chunked_transfer_encoding (a_file: FILE; a_len: INTEGER; a_chunk_size: INTEGER; a_output: HTTP_STREAM_SOCKET)
+			-- Append `a_file' content as chunks of `a_chunk_size' length to `a_output'.
 			-- If `a_len' >= 0 then read only `a_len' characters.
 		require
 			a_file_readable: a_file.exists and then a_file.is_access_readable
@@ -523,7 +620,44 @@ feature {NONE} -- Helpers
 				until
 					l_count = 0 or a_file.exhausted
 				loop
-					a_file.read_stream_thread_aware (l_count.min (2_048))
+					a_file.read_stream_thread_aware (l_count.min (a_chunk_size))
+					put_chunk (a_file.last_string, Void, a_output)
+					l_count := l_count - a_file.bytes_read
+				end
+				if not l_was_open then
+					a_file.close
+				end
+				put_chunk_end (Void, Void, a_output)
+			end
+		end
+
+	append_file_content_to_socket (a_file: FILE; a_len: INTEGER; a_output: HTTP_STREAM_SOCKET)
+			-- Append `a_file' content to `a_output'.
+			-- If `a_len' >= 0 then read only `a_len' characters.
+		require
+			a_file_readable: a_file.exists and then a_file.is_access_readable
+		local
+			l_was_open: BOOLEAN
+			l_count, l_buffer_size: INTEGER
+		do
+			if a_len >= 0 then
+				l_count := a_len
+			else
+				l_count := a_file.count
+			end
+			if l_count > 0 then
+				l_was_open := a_file.is_open_read
+				if a_file.is_open_read then
+					l_was_open := True
+				else
+					a_file.open_read
+				end
+				from
+					l_buffer_size := buffer_size
+				until
+					l_count = 0 or a_file.exhausted
+				loop
+					a_file.read_stream_thread_aware (l_count.min (l_buffer_size))
 					a_output.put_string (a_file.last_string)
 					l_count := l_count - a_file.bytes_read
 				end
@@ -541,6 +675,7 @@ feature {NONE} -- Helpers
 		local
 			l_was_open: BOOLEAN
 			l_count: INTEGER
+			l_buffer_size: INTEGER
 		do
 			if a_len >= 0 then
 				l_count := a_len
@@ -555,11 +690,11 @@ feature {NONE} -- Helpers
 					a_file.open_read
 				end
 				from
-
+					l_buffer_size := buffer_size
 				until
 					l_count = 0 or a_file.exhausted
 				loop
-					a_file.read_stream_thread_aware (l_count.min (2_048))
+					a_file.read_stream_thread_aware (l_count.min (l_buffer_size))
 					a_output.append (a_file.last_string)
 					l_count := l_count - a_file.bytes_read
 				end
@@ -569,7 +704,7 @@ feature {NONE} -- Helpers
 			end
 		end

-	append_socket_header_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: NETWORK_STREAM_SOCKET; a_output: STRING)
+	append_socket_header_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: HTTP_STREAM_SOCKET; a_output: STRING)
 			-- Get header from `a_socket' into `a_output'.
 		local
 			s: READABLE_STRING_8
@@ -579,7 +714,7 @@ feature {NONE} -- Helpers
 			until
 				s.same_string ("%R") or not a_socket.readable or a_response.error_occurred
 			loop
-				a_socket.read_line_thread_aware
+				a_socket.read_line_noexception
 				s := a_socket.last_string
 				if s.is_empty then
 					if session.is_debug_verbose then
@@ -595,7 +730,7 @@ feature {NONE} -- Helpers
 			end
 		end

-	append_socket_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: NETWORK_STREAM_SOCKET; a_len: INTEGER; a_output: STRING)
+	append_socket_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: HTTP_STREAM_SOCKET; a_len: INTEGER; a_output: STRING)
 			-- Get content from `a_socket' and append it to `a_output'.
 			-- If `a_len' is negative, try to get as much as possible,
 			-- this is probably HTTP/1.0 without any Content-Length.
@@ -614,7 +749,7 @@ feature {NONE} -- Helpers
 					until
 						r = 0 or else not a_socket.readable or else a_response.error_occurred
 					loop
-						a_socket.read_stream_thread_aware (r)
+						a_socket.read_stream_noexception (r)
 						l_count := l_count + a_socket.bytes_read
 						if session.is_debug_verbose then
 							log ("Debug:   - byte read=" + a_socket.bytes_read.out + "%N")
@@ -632,12 +767,12 @@ feature {NONE} -- Helpers
 						-- FIXME: check solution!
 					from
 						l_count := 0
-						l_chunk_size := 1_024
+						l_chunk_size := buffer_size
 						n := l_chunk_size --| value to satisfy until condition on first loop.
 					until
 						n < l_chunk_size or not a_socket.readable
 					loop
-						a_socket.read_stream_thread_aware (l_chunk_size)
+						a_socket.read_stream_noexception (l_chunk_size)
 						s := a_socket.last_string
 						n := a_socket.bytes_read
 						l_count := l_count + n
@@ -647,7 +782,7 @@ feature {NONE} -- Helpers
 			end
 		end

-	append_socket_chunked_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: NETWORK_STREAM_SOCKET; a_output: STRING)
+	append_socket_chunked_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: HTTP_STREAM_SOCKET; a_output: STRING)
 			-- Get chunked content from `a_socket' and append it to `a_output'.
 		require
 			socket_readable: a_socket.readable
@@ -668,7 +803,7 @@ feature {NONE} -- Helpers
 			until
 				n = 0 or not a_socket.readable
 			loop
-				a_socket.read_line_thread_aware -- Read chunk info
+				a_socket.read_line_noexception
 				s := a_socket.last_string
 				s.right_adjust
 				if session.is_debug_verbose then
@@ -697,7 +832,7 @@ feature {NONE} -- Helpers
 					until
 						r = 0 or else not a_socket.readable or else a_response.error_occurred
 					loop
-						a_socket.read_stream_thread_aware (r)
+						a_socket.read_stream_noexception (r)
 						l_count := l_count + a_socket.bytes_read
 						if session.is_debug_verbose then
 							log ("Debug:   - byte read=" + a_socket.bytes_read.out + "%N")
@@ -707,9 +842,9 @@ feature {NONE} -- Helpers
 						a_output.append (a_socket.last_string)
 					end

-					a_socket.read_character
+					a_socket.read_character_noexception
 					check a_socket.last_character = '%R' end
-					a_socket.read_character
+					a_socket.read_character_noexception
 					check a_socket.last_character = '%N' end
 					if session.is_debug_verbose then
 						log ("Debug:   - Found CRNL %N")
@@ -718,16 +853,42 @@ feature {NONE} -- Helpers
 			end
 		end

-	new_mime_boundary: STRING
+	new_mime_boundary (a_data: HASH_TABLE [READABLE_STRING_32, READABLE_STRING_32]): STRING
 			-- New MIME boundary.
+		local
+			s: STRING
+			ran: RANDOM
+			n: INTEGER
+			i,j: INTEGER
 		do
-				-- FIXME: better boundary creation
-			Result := "----------------------------5eadfcf3bb3e"
+			across
+				a_data as ic
+			loop
+				i := i + ic.item.count + ic.key.count
+			end
+			create ran.set_seed (i) -- FIXME: use a real random seed.
+			ran.start
+			ran.forth
+			n := (20 * ran.real_item).truncated_to_integer
+			create Result.make_filled ('-', 3 + n)
+			s := "_1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+			from
+			until
+				Result.count >= 40
+			loop
+				ran.forth
+				j := (ran.real_item * s.count).truncated_to_integer.max (1)
+				Result.append_character (s[j])
+			end
+			check Result.count = 40 and Result.starts_with ("---") end
 		end

+	crlf: STRING = "%R%N"
+			-- CR and NL sequence.
+
 invariant
 note
-	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/network/http_client/src/spec/net/net_http_client_session.e
+++ b/library/network/http_client/src/spec/net/net_http_client_session.e
@@ -14,7 +14,7 @@ inherit
 			close
 		end

-	NET_HTTP_CLIENT_INFO
+	HTTP_SECURE_HELPER

 create
 	make
@@ -32,7 +32,7 @@ feature -- Status report
 		do
 			Result := True
 			if base_url.starts_with_general ("https://") then
-				Result := has_https_support
+				Result := is_secure_connection_supported
 			end
 		end

@@ -172,7 +172,7 @@ feature {NONE} -- Implementation
 		end

 note
-	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
+	copyright: "2011-2016, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
--- a/library/network/http_client/src/spec/net/no_ssl/ssl_network_stream_socket.e
+++ b/library/network/http_client/src/spec/net/no_ssl/ssl_network_stream_socket.e
@@ -1,22 +0,0 @@
-note
-	description: "[
-			A fake SSL network stream socket... when SSL is disabled at compilation time.
-			Its behavior is similar to NETWORK_STREAM_SOCKET.
-		]"
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	SSL_NETWORK_STREAM_SOCKET
-
-inherit
-	NETWORK_STREAM_SOCKET
-
-create
-	make, make_empty, make_client_by_port, make_client_by_address_and_port, make_server_by_port, make_loopback_server_by_port
-
-create {SSL_NETWORK_STREAM_SOCKET}
-	make_from_descriptor_and_address, create_from_descriptor
-	
-
-end
--- a/library/network/http_client/src/spec/net/ssl/net_http_client_info.e
+++ b/library/network/http_client/src/spec/net/ssl/net_http_client_info.e
@@ -1,24 +0,0 @@
-note
-	description: "Additional information related to NET HTTP Client.."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	NET_HTTP_CLIENT_INFO
-
-feature -- Access
-
-	has_https_support: BOOLEAN = True
-			-- Is HTTPS supported?
-
-note
-	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			5949 Hollister Ave., Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-end
--- a/library/network/http_client/tests/test-safe.ecf
+++ b/library/network/http_client/tests/test-safe.ecf
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-14-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-14-0 http://www.eiffel.com/developers/xml/configuration-1-14-0.xsd" name="test_http_client" uuid="920E5C50-41E1-4DAC-8D48-D9C860E49228">
+<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="test_http_client" uuid="920E5C50-41E1-4DAC-8D48-D9C860E49228">
 	<target name="test_http_client">
 		<root class="TEST" feature="make"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
-			<exclude>/EIFGENs$</exclude>
 			<exclude>/.svn$</exclude>
+			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all">
+		<option warning="true"  void_safety="all">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<variable name="netssl_http_client_enabled" value="false"/>
--- a/library/network/http_client/tests/test_net_with_web.e
+++ b/library/network/http_client/tests/test_net_with_web.e
@@ -64,4 +64,9 @@ feature -- Tests
 			test_get_with_authentication
 		end

+	net_test_post_with_file_using_chunked_transfer_encoding
+		do
+			test_post_with_file_using_chunked_transfer_encoding
+		end
+
 end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jocelyn Fiat	f56aa22c29	Fixed compilation of proxy and simple examples. Made the websocket client library scoop capable.	2016-12-05 15:56:46 +01:00
Jocelyn Fiat	186e5514eb	If the count for put_file_content is not positive (i.e <= 0), do not send anything. Output/log more information for request handling when standalone httpd server has verbose enabled.	2016-12-01 21:20:14 +01:00
Jocelyn Fiat	9fd53b9b1f	Fixed debug.ecf file from debug example.	2016-12-01 21:08:13 +01:00
Jocelyn Fiat	27c77721fd	Fixed a few void-safety issue, attribute not initialized before computing agent objects.	2016-12-01 20:41:03 +01:00
Jocelyn Fiat	c2202e82f6	Fixed compilation of desktop app example.	2016-12-01 18:43:22 +01:00
Jocelyn Fiat	72a40a2673	Fixed potential void-safety issue in descendants related to initialization of router and filter.	2016-12-01 18:14:07 +01:00
Jocelyn Fiat	2fbffd0c1e	Fixed compilation.	2016-12-01 16:09:41 +01:00
Jocelyn Fiat	9e5fec9c34	Removed unwanted files.	2016-12-01 15:02:40 +01:00
Jocelyn Fiat	ca8f95a594	Made library ecf compilable in scoop concurrency mode by default. So ecf files are compilable with 16.05 and 16.11 .	2016-12-01 14:56:56 +01:00
Jocelyn Fiat	5a9ccce558	Made library ecf compilable in scoop concurrency mode by default. Except nino related projects that depends on EiffelThread.	2016-11-01 14:30:19 +01:00
Jocelyn Fiat	d05c919668	Made the notification_email library compilable with 16.05 and upcoming 16.11 .	2016-11-01 14:22:48 +01:00
Jocelyn Fiat	087b5d49bb	Fixed wsf_js_widget compilation.	2016-11-01 14:01:50 +01:00
Jocelyn Fiat	c7b1d4bb4c	Use the theoretical version number of EiffelStudio when we inserted new features to EiffelNet.	2016-10-31 17:12:55 +01:00
Jocelyn Fiat	193f22ebc8	Fixed wsf tests project. Added ini config support to simple_file example.	2016-10-25 15:22:18 +02:00
Jocelyn Fiat	5e79751522	Updated WGI_OUTPUT_STREAM.put_file_content .	2016-10-25 13:44:44 +02:00
Jocelyn Fiat	ac908e4efd	Fixed expiration, and cache-control: max-age implementation. Also use `FILE.date` instead of `FILE.change_date` (`change_date` is the date of the last status change, quite often same as creation date, while `date` is the last modification date).	2016-10-24 12:51:21 +02:00
Jocelyn Fiat	885195dbaa	Added `WSF_RESPONSE.put_file_content (f: FILE, a_offset: INTEGER; a_count: INTEGER)` to allow potential future optimization.	2016-10-24 12:47:33 +02:00
Jocelyn Fiat	2e49febca8	Fixed the EiffelStudio EiffelWeb wizard.	2016-10-21 19:40:13 +02:00
Jocelyn Fiat	53f4f64596	Added feature to manipulate easily the chain of filters.	2016-10-21 19:39:42 +02:00
Jocelyn Fiat	dff9007aa6	Updated (un)install script to include new network, httpd, and websocket libraries.	2016-10-18 13:29:47 +02:00
Jocelyn Fiat	c34f89df9b	Added connection header related functions. - WSF_REQUEST.is_keep_alive_http_connection: BOOLEAN - HTTP_HEADER_MODIFIER.put_connection_keep_alive - HTTP_HEADER_MODIFIER.put_connection_close In Standalone request handler code, better detection of Connection: keep-alive header.	2016-10-18 13:22:32 +02:00
Jocelyn Fiat	4a47a00747	Better all-safe.ecf file under wsf/connector .	2016-10-15 22:37:16 +02:00
Jocelyn Fiat	12508c8e21	Updated to use new standalone option names.	2016-10-15 22:19:19 +02:00
Jocelyn Fiat	3d58ef84fa	Fixed void-safety settings on web_socket_protocol.ecf .	2016-10-15 22:14:03 +02:00
Jocelyn Fiat	3a120f3311	Updated http_client library to benefit from http_network library.	2016-10-15 21:42:51 +02:00
Jocelyn Fiat	d45b90e52a	Fixed ecf to get them compiled.	2016-10-14 17:57:02 +02:00
Jocelyn Fiat	c74b9e0c45	The network classes are now under http_network library, thus renamed the header file as ew_network.h .	2016-10-14 16:46:26 +02:00
Jocelyn Fiat	b8aee435dd	Updated simple_ssl example to use directly the standalone connector, and use the new WSF_STANDALONE_SERVICE_OPTIONS class. Added WSF_STANDALONE_SERVICE to make it easy to use directly.	2016-10-14 15:13:27 +02:00
Jocelyn Fiat	a4d737d548	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.	2016-10-14 14:32:04 +02:00
Jocelyn Fiat	16f667af2c	Reverted a few ecf files from ecf version 1-16-0 to ecf version 1-15-0. Added target "http_network_ssl" to test http_network with ssl support.	2016-10-14 14:00:03 +02:00
Jocelyn Fiat	27a5c9d969	Fixed http_network compilation for EiffelStudio before version 16.11.	2016-10-14 13:51:57 +02:00
Jocelyn Fiat	32ad7f0c65	Merged changes related to websocket and restructured httpd, http_ network libraries.	2016-10-14 13:17:17 +02:00
Jocelyn Fiat	78f24ecb37	Updated ws.ini (for now, keep is_secure False, due to remaining issue with websocket and SSL implementation).	2016-10-14 13:11:26 +02:00
Jocelyn Fiat	1161e541fa	Accept "yes" or "true" in wsf launcher option boolean values. Set socket_error when network occurs in `read_to_managed_pointer_noexception`.	2016-10-14 13:10:44 +02:00
Jocelyn Fiat	d4ec640ac8	Renamed many classes and feature to use "secure" term instead of "ssl". (note, the .ecf are still using the "ssl" terminologie). Provided easy way to set secure settings for Standalone. For wsf launcher boolean option accept "true" or "yes" for True boolean, anything else is False.	2016-10-14 11:52:48 +02:00
Jocelyn Fiat	01a9d02586	Added websocket examples for the server and client.	2016-10-13 22:01:50 +02:00
Jocelyn Fiat	1e4203111f	Use socket `.._noexception` functions in websocket networking.	2016-10-13 21:55:53 +02:00
Jocelyn Fiat	b84f4838f5	Added new WSF_STANDALONE_SERVICE_OPTIONS, a descendant of WSF_SERVICE_LAUNCHER_OPTIONS specialized for standalone connectors.	2016-10-13 21:55:16 +02:00
Jocelyn Fiat	8b43cb909a	Do not use `put_readable_string_8_noexception`, and just update `put_string_8_noexception` to accept READABLE_STRING_8.	2016-10-13 21:53:12 +02:00
Jocelyn Fiat	897f64e4fe	Reuse http_network library. Reintroduced HTTPD_STREAM_SOCKET for backward compatibility, and ease of usage. Added websocket libraries (client, and protocol).	2016-10-13 16:25:11 +02:00
Jocelyn Fiat	981942b2d6	Extracted network socket classes from httpd folder, and created a new library/network/http_network library. Renamed HTTPD_STREAM_SOCKET as HTTP_STREAM_SOCKET. Made http_client (net) library use the new http_network library.	2016-10-12 23:27:55 +02:00
Jocelyn Fiat	c132d7734b	Moved httpd library from ewsgi/connectors/standalone/lib/httpd to httpd. Reused the http_network library as well inside httpd library.	2016-10-12 22:54:21 +02:00
Jocelyn Fiat	b66cfce138	Use custom variable `net_ssl_enabled` instead of `httpd_ssl_enabled` for the http_netword lib.	2016-10-12 22:23:26 +02:00
Jocelyn Fiat	d28f794828	Implemented chunked Transfer-Encoding in net_http_client. Implemented support for buffer_size and chunk_size for net_http_client.	2016-10-12 16:49:08 +02:00
Jocelyn Fiat	9e92b8c0fa	Fixed typo in restbuck name.	2016-10-12 11:21:42 +02:00
Jocelyn Fiat	ef704790a8	Fixed the "wsf_tests" autocase suite, which was wrong for cookies, and other minor changes.	2016-10-12 11:21:27 +02:00
Jocelyn Fiat	57b1691243	Added support for debug.ini to debug example.	2016-10-12 11:19:54 +02:00
Jocelyn Fiat	29590b1c0d	Fixed potential issue related to PATH_INFO, and `percent_encoded_path_info` computing , when script name is in different path.	2016-10-12 11:19:23 +02:00
Jocelyn Fiat	ed959042d7	Fixed issue with input using "Transfer-Encoding: chunked".	2016-10-12 11:12:37 +02:00