Updated (un)install script to include new network, httpd, and websocket libraries.

- 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.

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

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

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

examples/simple_ssl/simple_ssl.ecf

@@ -13,9 +13,9 @@
 		</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="wsf_standalone" location="..\..\library\server\wsf\connector\standalone-safe.ecf"/>
 		<library name="http" location="..\..\library\network\protocol\http\http-safe.ecf"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
 		<cluster name="simple" location=".\" recursive="true"/>

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
@@ -96,9 +96,10 @@ $(document).ready(function() {
 
 	function connect(){
 
-			var host = "##WSSCHEME##://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(){

library/network/http_client/http_client-safe.ecf

@@ -18,12 +18,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 +42,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>

library/network/http_client/http_client.ecf

@@ -18,12 +18,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 +42,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>

library/network/http_client/net_http_client-safe.ecf

@@ -27,20 +27,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="ssl_enabled" excluded_value="true"/>
-						<custom name="netssl_http_client_enabled" excluded_value="true"/>
-					</condition>
-				</cluster>
-				<cluster name="net_ssl_enabled" location="$|ssl\">
-					<condition>
-						<custom name="ssl_enabled" value="true"/>
-					</condition>
-					<condition>
-						<custom name="netssl_http_client_enabled" value="true"/>
-					</condition>
-				</cluster>
 			</cluster>
 			<cluster name="default_net" location="$|default\net\"/>
 		</cluster>

library/network/http_client/net_http_client.ecf

@@ -27,20 +27,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="ssl_enabled" excluded_value="true"/>
-						<custom name="netssl_http_client_enabled" excluded_value="true"/>
-					</condition>
-				</cluster>
-				<cluster name="net_ssl_enabled" location="$|ssl\">
-					<condition>
-						<custom name="ssl_enabled" value="true"/>
-					</condition>
-					<condition>
-						<custom name="netssl_http_client_enabled" value="true"/>
-					</condition>
-				</cluster>
 			</cluster>
 			<cluster name="default_net" location="$|default\net\"/>
 		</cluster>

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

library/network/http_client/src/spec/net/no_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 = False
-			-- 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

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

library/network/http_network/http_network-safe.ecf

@@ -34,9 +34,31 @@
 				<custom name="httpd_ssl_enabled" value="true"/>
 			</condition>
 		</library>
+
+		<external_include location="$(ISE_LIBRARY)/unstable/library/network/socket/netssl/spec/include">
+			<condition>
+				<platform excluded_value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_include location="$(ISE_LIBRARY)\unstable\library\network\socket\netssl\spec\include">
+			<condition>
+				<platform value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_cflag value="-D_WINSOCKAPI_">
+			<condition>
+				<platform value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_cflag>
 		<cluster name="network" location=".\src\">
 			<file_rule>
-				<exclude>/httpd_stream_socket_ext.e$</exclude>
+				<exclude>/http_stream_socket_ext.e$</exclude>
 				<condition>
 					<version type="compiler" max="16.11.0.0"/>
 				</condition>
@@ -59,7 +81,7 @@
 					<custom name="httpd_ssl_enabled" value="true"/>
 				</condition>
 				<file_rule>
-					<exclude>/httpd_stream_ssl_socket_ext.e$</exclude>
+					<exclude>/http_stream_secure_socket_ext.e$</exclude>
 					<condition>
 						<version type="compiler" max="16.11.0.0"/>
 						<custom name="ssl_enabled" value="true"/>
@@ -95,4 +117,7 @@
 			</cluster>
 		</cluster>
 	</target>
+	<target name="http_network_ssl" extends="http_network">
+		<variable name="ssl_enabled" value="true" />
+	</target>
 </system>

library/network/http_network/http_network.ecf

@@ -34,9 +34,31 @@
 				<custom name="httpd_ssl_enabled" value="true"/>
 			</condition>
 		</library>
+
+		<external_include location="$(ISE_LIBRARY)/unstable/library/network/socket/netssl/spec/include">
+			<condition>
+				<platform excluded_value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_include location="$(ISE_LIBRARY)\unstable\library\network\socket\netssl\spec\include">
+			<condition>
+				<platform value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_include>
+		<external_cflag value="-D_WINSOCKAPI_">
+			<condition>
+				<platform value="windows"/>
+				<custom name="ssl_enabled" value="true"/>
+				<version type="compiler" max="16.11.0.0"/>
+			</condition>
+		</external_cflag>
 		<cluster name="network" location=".\src\">
 			<file_rule>
-				<exclude>/httpd_stream_socket_ext.e$</exclude>
+				<exclude>/http_stream_socket_ext.e$</exclude>
 				<condition>
 					<version type="compiler" max="16.11.0.0"/>
 				</condition>
@@ -59,7 +81,7 @@
 					<custom name="httpd_ssl_enabled" value="true"/>
 				</condition>
 				<file_rule>
-					<exclude>/httpd_stream_ssl_socket_ext.e$</exclude>
+					<exclude>/http_stream_secure_socket_ext.e$</exclude>
 					<condition>
 						<version type="compiler" max="16.11.0.0"/>
 						<custom name="ssl_enabled" value="true"/>
@@ -95,4 +117,7 @@
 			</cluster>
 		</cluster>
 	</target>
+	<target name="http_network_ssl" extends="http_network">
+		<variable name="ssl_enabled" value="true" />
+	</target>
 </system>

library/network/http_network/spec/include_until_16_05/ew_network.h

@@ -1,6 +1,6 @@
 /*
 indexing
-	description: "Functions used by the EiffelWeb httpd networking classes. "
+	description: "Functions used by the EiffelWeb http networking classes. "
 	copyright:	"Copyright (c) 2011-2016, Jocelyn Fiat, Eiffel Software and others"
 	license:	"Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
@@ -12,8 +12,8 @@ indexing
 		]"
 */
 
-#ifndef _ew_httpd_net_h_
-#define _ew_httpd_net_h_
+#ifndef _ew_network_h_
+#define _ew_network_h_
 
 #include "eif_config.h"
 

library/network/http_network/src/until_16_05/http_stream_socket_ext.e

@@ -81,7 +81,7 @@ feature {NONE} -- Externals
 	c_set_sock_recv_timeout (a_fd, a_level: INTEGER; a_timeout_seconds: INTEGER)
 			-- C routine to set socket option `SO_RCVTIMEO' with `a_timeout_seconds' seconds.
 		external
-			"C inline use %"ew_httpd_net.h%""
+			"C inline use %"ew_network.h%""
 		alias
 			"[
 #ifdef SO_RCVTIMEO 
@@ -105,7 +105,7 @@ feature {NONE} -- Externals
 	c_set_sock_send_timeout (a_fd, a_level: INTEGER; a_timeout_seconds: INTEGER)
 			-- C routine to set socket option `SO_SNDTIMEO' with `a_timeout_seconds' seconds.
 		external
-			"C inline use %"ew_httpd_net.h%""
+			"C inline use %"ew_network.h%""
 		alias
 			"[
 #ifdef SO_RCVTIMEO 
@@ -131,7 +131,7 @@ feature {NONE} -- No-Exception network operation
 			-- External routine to read a `len' number of characters
 			-- into buffer `buf' from socket `a_fd' with options `flags'.
 		external
-			"C inline use %"ew_httpd_net.h%""
+			"C inline use %"ew_network.h%""
 		alias
 			"[
 				recv((int) $a_fd, (char *) $buf, (int) $len, (int) $flags)
@@ -150,7 +150,7 @@ feature {NONE} -- No-Exception network operation
 			-- length `length' to socket `fd'.
 			-- Note: does not raise exception on error, but return error value as Result.
 		external
-			"C inline use %"ew_httpd_net.h%""
+			"C inline use %"ew_network.h%""
 		alias
 			"[
 				send((int) $a_fd, (char *) $buf, (int) $len, (int) 0)

library/network/protocol/http/src/http_header_modifier.e

@@ -544,6 +544,26 @@ feature -- Others
 			put_pragma ("no-cache")
 		end
 
+feature -- Connection		
+
+	put_connection (a_conn: READABLE_STRING_8)
+			-- Put "Connection" header with `a_conn' value.
+		do
+			put_header_key_value ({HTTP_HEADER_NAMES}.header_connection, a_conn)
+		end
+
+	put_connection_keep_alive
+			-- Put "Connection" header with "keep-alive".
+		do
+			put_connection ("keep-alive")
+		end
+
+	put_connection_close
+			-- Put "Connection" header with "close".
+		do
+			put_connection ("close")
+		end
+
 feature -- Redirection
 
 	put_location (a_uri: READABLE_STRING_8)

library/network/websocket/protocol/web_socket_protocol.ecf

@@ -2,6 +2,8 @@
 <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="protocol" uuid="97582991-7BF3-4F4D-8944-8141ADE34274" library_target="protocol">
 	<target name="protocol">
 		<root all_classes="true"/>
+		<option void_safety="none">
+		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<cluster name="src" location=".\" recursive="true"/>
 	</target>

library/network/websocket/server/example/echo_websocket_server/application.e

@@ -22,9 +22,9 @@ feature {NONE} -- Initialization
 			opts.set_is_verbose (True) -- For debug purpose
 			opts.set_verbose_level ("debug")
 
-			opts.set_ssl_enabled (True) -- If SSL is supported
-			opts.set_ssl_ca_crt ("ca.crt") -- Change to use your own crt file.
-			opts.set_ssl_ca_key ("ca.key") -- Change to use your own key file.
+			opts.set_is_secure (True) -- If SSL is supported
+			opts.set_secure_certificate ("ca.crt") -- Change to use your own crt file.
+			opts.set_secure_certificate_key ("ca.key") -- Change to use your own key file.
 
 			opts.set_port (default_port_number)
 		end

library/network/websocket/server/example/echo_websocket_server/echo_websocket_server-safe.ecf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="echo_websocket_server" uuid="C9B3DA5F-DF0D-4C0F-924A-130B5C1E6604">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-15-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-15-0 http://www.eiffel.com/developers/xml/configuration-1-15-0.xsd" name="echo_websocket_server" uuid="C9B3DA5F-DF0D-4C0F-924A-130B5C1E6604">
 	<target name="common">
 		<file_rule>
 			<exclude>/.git$</exclude>
@@ -7,11 +7,12 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option concurrency="none" debug="true" warning="true" full_class_checking="false" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional">
+		<option debug="true" warning="true" full_class_checking="false" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional">
 			<debug name="ws" enabled="true"/>
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf">
 			<option>
 				<assertions precondition="true"/>
@@ -30,18 +31,16 @@
 	</target>
 	<target name="echo_websocket_server_mt" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option concurrency="thread" root_concurrency="thread">
-		</option>
+		<setting name="concurrency" value="thread"/>
 	</target>
 	<target name="echo_websocket_server_mt_ssl" extends="echo_websocket_server_mt">
 		<variable name="ssl_enabled" value="true"/>
 	</target>
 	<target name="echo_websocket_server_scoop" extends="common">
 		<root class="APPLICATION" feature="make_and_launch"/>
-		<option concurrency="scoop" root_concurrency="scoop">
-		</option>
+		<setting name="concurrency" value="scoop"/>
 	</target>
 	<target name="echo_websocket_server_scoop_ssl" extends="echo_websocket_server_scoop">
-		<variable name="httpd_ssl_enabled" value="true"/>
+		<variable name="ssl_enabled" value="true"/>
 	</target>
 </system>

library/network/websocket/server/websocket_server-safe.ecf

@@ -15,8 +15,8 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto-safe.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf"/>
-		<library name="standalone_websocket_connector" location="..\..\..\server\wsf\connector\standalone_websocket-safe.ecf" readonly="false"/>
-		<library name="wsf" location="..\..\..\server\wsf\wsf-safe.ecf" readonly="false"/>
+		<library name="standalone_websocket_connector" location="..\..\..\server\wsf\connector\standalone_websocket-safe.ecf"/>
+		<library name="wsf" location="..\..\..\server\wsf\wsf-safe.ecf"/>
 
 		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf">
@@ -25,9 +25,6 @@
 			</condition>
 		</library>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<!--
-		<cluster name="protocol" location="..\protocol\" recursive="true"/>
-		-->
 		<cluster name="websocket_server" location=".\src\" recursive="true"/>
 	</target>
 </system>

library/network/websocket/server/websocket_server.ecf

@@ -15,8 +15,8 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="crypto" location="$ISE_LIBRARY\unstable\library\text\encryption\crypto\crypto.ecf"/>
 		<library name="encoder" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\text\encoder\encoder.ecf"/>
-		<library name="http_network" location="..\..\http_network\http_network.ecf" readonly="false"/>
-		<library name="httpd" location="lib\httpd\httpd.ecf"/>
+		<library name="standalone_websocket_connector" location="..\..\..\server\wsf\connector\standalone_websocket.ecf"/>
+		<library name="wsf" location="..\..\..\server\wsf\wsf.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf">
 			<condition>
@@ -24,7 +24,6 @@
 			</condition>
 		</library>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<cluster name="protocol" location="..\protocol\" recursive="true"/>
 		<cluster name="websocket_server" location=".\src\" recursive="true"/>
 	</target>
 </system>

library/server/ewsgi/connectors/standalone/test_standalone-safe.ecf

@@ -10,11 +10,6 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_standalone" location="standalone-safe.ecf" readonly="false"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
-		<library name="httpd_edit" location="lib\httpd\httpd-safe.ecf" readonly="false">
-			<option debug="true">
-				<debug name="dbglog" enabled="true"/>
-			</option>
-		</library>
 		<library name="wsf" location="..\..\..\wsf\wsf-safe.ecf" readonly="false"/>
 		<cluster name="tests" location="tests\" recursive="true"/>
 	</target>
@@ -27,7 +22,7 @@
 	<target name="test_connector_standalone" extends="test_standalone_scoop">
 	</target>
 	<target name="test_standalone_scoop_ssl" extends="test_standalone_scoop">
-		<variable name="httpd_ssl_enabled" value="true"/>
+		<variable name="ssl_enabled" value="true"/>
 		<variable name="libcurl_http_client_disabled" value="true"/>
 		<variable name="net_http_client_disabled" value="false"/>
 		<variable name="netssl_http_client_enabled" value="true"/>

library/server/httpd/httpd_request_handler_i.e

@@ -455,14 +455,11 @@ feature -- Parsing
 							-- Except for HTTP/1.0, persistent connection is the default.
 						is_persistent_connection_requested := True
 						if is_http_version_1_0 then
-							is_persistent_connection_requested := attached request_header_map.item ("Connection") as l_connection and then
-										l_connection.is_case_insensitive_equal_general ("keep-alive")
+							is_persistent_connection_requested := has_keep_alive_http_connection_header (request_header_map)
 						else
 								-- By default HTTP:1/1 support persistent connection.
-							if attached request_header_map.item ("Connection") as l_connection then
-								if l_connection.is_case_insensitive_equal_general ("close") then
-									is_persistent_connection_requested := False
-								end
+							if has_close_http_connection_header (request_header_map) then
+								is_persistent_connection_requested := False
 							else
 								is_persistent_connection_requested := True
 							end
@@ -476,6 +473,46 @@ feature -- Parsing
 			end
 		end
 
+	has_keep_alive_http_connection_header (h_map: like request_header_map): BOOLEAN
+			-- Does Current request header map `h_map' have "keep-alive" connection header?
+		local
+			i: INTEGER
+		do
+			if attached h_map.item ("Connection") as l_connection then
+					-- Could be for instance "keep-alive, Upgrade"
+				i := l_connection.substring_index ("keep-alive", 1)
+				if i > 0 then
+					i := i + 9 -- "keep-alive" has 10 characters
+					check i <= l_connection.count end
+					if i = l_connection.count then
+						Result := True
+					else
+						Result := l_connection [i + 1] = ',' or l_connection [i + 1].is_space
+					end
+				end
+			end
+		end
+
+	has_close_http_connection_header (h_map: like request_header_map): BOOLEAN
+			-- Does Current request header map `h_map' have "close" connection header?
+		local
+			i: INTEGER
+		do
+			if attached h_map.item ("Connection") as l_connection then
+					-- Could be for instance "close, ..."
+				i := l_connection.substring_index ("close", 1)
+				if i > 0 then
+					i := i + 4 -- "close" has 5 characters
+					check i <= l_connection.count end
+					if i = l_connection.count then
+						Result := True
+					else
+						Result := l_connection [i + 1] = ',' or l_connection [i + 1].is_space
+					end
+				end
+			end
+		end
+
 	analyze_request_line (line: STRING)
 			-- Analyze `line' as a HTTP request line.
 			-- note: may update `has_error'.

library/server/wsf/connector/all-safe.ecf

@@ -18,13 +18,10 @@
 		<library name="ewsgi" location="..\..\ewsgi\ewsgi-safe.ecf"/>
 		<library name="http" location="..\..\..\network\protocol\http\http-safe.ecf"/>
 		<library name="standalone" location="standalone-safe.ecf" readonly="false"/>
-		<library name="nino" location="nino-safe.ecf" readonly="false">
-			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
-		</library>
+		<library name="standalone_ws" location="standalone_websocket-safe.ecf" readonly="false"/>
+		<library name="openshift" location="openshift-safe.ecf" readonly="false"/>
+		<library name="nino" location="nino-safe.ecf" readonly="false"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf"/>
-		<cluster name="wsf_cgi" location=".\cgi\" recursive="true"/>
-		<cluster name="wsf_libfcgi" location=".\libfcgi\" recursive="true"/>
-		<cluster name="wsf_standalone" location=".\standalone\" recursive="true"/>
 	</target>
 </system>

library/server/wsf/connector/standalone-safe.ecf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="wsf_standalone" uuid="9BF2D71A-0986-4025-9C97-15B65F07C568" library_target="wsf_standalone">
+<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="wsf_standalone" uuid="9BF2D71A-0986-4025-9C97-15B65F07C568" library_target="wsf_standalone">
 	<target name="wsf_standalone">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,8 +7,9 @@
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option concurrency="none" warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="provisional">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop" />
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_standalone" location="..\..\ewsgi\connectors\standalone\standalone-safe.ecf" use_application_options="true"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>

library/server/wsf/connector/standalone/wsf_standalone_service.e

@@ -0,0 +1,24 @@
+note
+	description: "[
+			Service using standalone connector launcher.
+		]"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	WSF_STANDALONE_SERVICE [G -> WSF_EXECUTION create make end]
+
+inherit
+	WSF_LAUNCHABLE_SERVICE
+
+feature {NONE} -- Initialization
+
+	launch (opts: detachable WSF_SERVICE_LAUNCHER_OPTIONS)
+		local
+			l_launcher: WSF_STANDALONE_SERVICE_LAUNCHER [G]
+		do
+			create l_launcher.make_and_launch (opts)
+		end	
+
+end

library/server/wsf/default/standalone-safe.ecf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="default_standalone" uuid="5CBA8C5A-3191-434A-8DE1-C0C3CAC9C4F4" library_target="default_standalone">
+<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="default_standalone" uuid="5CBA8C5A-3191-434A-8DE1-C0C3CAC9C4F4" library_target="default_standalone">
 	<target name="default_standalone">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,11 +7,12 @@
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option concurrency="none" warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="provisional">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf" use_application_options="true"/>
-		<library name="wsf_standalone" location="..\connector\standalone-safe.ecf" use_application_options="true"/>
+		<library name="wsf_standalone" location="..\connector\standalone-safe.ecf"/>
 		<cluster name="default_standalone" location=".\standalone\" recursive="true"/>
 	</target>
 </system>

library/server/wsf/default/standalone.ecf

@@ -9,6 +9,7 @@
 		</file_rule>
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="wsf" location="..\wsf.ecf"/>
 		<library name="wsf_standalone" location="..\connector\standalone.ecf"/>

library/server/wsf/src/wsf_request.e

@@ -1200,11 +1200,19 @@ feature -- HTTP_*
 
 	http_connection: detachable READABLE_STRING_8
 			-- Contents of the Connection: header from the current wgi_request, if there is one.
-			-- Example: 'Keep-Alive'.
+			-- Example: 'keep-alive'.
 		do
 			Result := wgi_request.http_connection
 		end
 
+	is_keep_alive_http_connection: BOOLEAN
+			-- Is a keep-alive connection?
+		do
+			if attached http_connection as conn then
+				Result := conn.starts_with ("keep-alive")
+			end
+		end
+
 	http_expect: detachable READABLE_STRING_8
 			-- The Expect request-header field is used to indicate that particular server behaviors are required by the client.
 			-- Example: '100-continue'.

library/server/wsf_proxy/reverse_proxy/wsf_simple_reverse_proxy_handler.e

@@ -291,11 +291,8 @@ feature {NONE} -- Implementation
 			response.set_status_code (a_status_code)
 			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

tests/all-safe.ecf

@@ -31,7 +31,7 @@
 		<library name="filter" location="..\examples\filter\filter-safe.ecf" readonly="false"/>
 		<library name="hello_world" location="..\library\server\ewsgi\examples\hello_world\hello-safe.ecf" readonly="false"/>
 		<library name="http" location="..\library\network\protocol\http\http-safe.ecf" readonly="false"/>
-		<library name="httpd" location="..\library\server\ewsgi\connectors\standalone\lib\httpd\httpd-safe.ecf" readonly="false"/>
+		<library name="httpd" location="..\library\server\httpd\httpd-safe.ecf" readonly="false"/>
 		<library name="http_authorization" location="..\library\server\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
 		<library name="http_client" location="..\library\network\http_client\http_client-safe.ecf" readonly="false"/>
 		<library name="libfcgi" location="..\library\server\libfcgi\libfcgi-safe.ecf" readonly="false"/>

tests/all-stable-safe.ecf

@@ -67,6 +67,6 @@
 	<target name="all_stable_with_ssl" extends="all_stable">
 		<description>Compiling with ssl enabled</description>
 		<root all_classes="true"/>
-		<variable name="httpd_ssl_enabled" value="true"/>
+		<variable name="ssl_enabled" value="true"/>
 	</target>
 </system>

tools/install_ewf.bat

@@ -53,6 +53,8 @@ echo Install framework ewf
 %SAFE_MD% %TMP_CONTRIB_DIR%\library\web\framework\ewf
 echo Install library: ewf/ewsgi
 %COPYCMD% %TMP_DIR%\library\server\ewsgi	%TMP_CONTRIB_DIR%\library\web\framework\ewf\ewsgi
+echo Install library: ewf/httpd
+%COPYCMD% %TMP_DIR%\library\server\httpd	%TMP_CONTRIB_DIR%\library\web\framework\ewf\httpd
 echo Install library: ewf/libfcgi
 %COPYCMD% %TMP_DIR%\library\server\libfcgi	%TMP_CONTRIB_DIR%\library\web\framework\ewf\libfcgi
 echo Install library: ewf/wsf
@@ -86,6 +88,10 @@ echo Install library: error
 %COPYCMD% %TMP_DIR%\library\utility\general\error	%TMP_CONTRIB_DIR%\library\utility\general\error
 echo Install library: http_client
 %COPYCMD% %TMP_DIR%\library\network\http_client	%TMP_CONTRIB_DIR%\library\network\http_client
+echo Install library: http_network
+%COPYCMD% %TMP_DIR%\library\network\http_network	%TMP_CONTRIB_DIR%\library\network\http_network
+echo Install library: websocket
+%COPYCMD% %TMP_DIR%\library\network\websocket	%TMP_CONTRIB_DIR%\library\network\websocket
 echo Install library: http
 %COPYCMD% %TMP_DIR%\library\network\protocol\http	%TMP_CONTRIB_DIR%\library\network\protocol\http
 echo Install library: content_negotiation

tools/uninstall_ewf.bat

@@ -55,6 +55,10 @@ echo Uninstall library: error
 %RDCMD% %TMP_CONTRIB_DIR%\library\utility\general\error
 echo Uninstall library: http_client
 %RDCMD% %TMP_CONTRIB_DIR%\library\network\http_client
+echo Uninstall library: http_network
+%RDCMD% %TMP_CONTRIB_DIR%\library\network\http_network
+echo Uninstall library: websocket
+%RDCMD% %TMP_CONTRIB_DIR%\library\network\websocket
 echo Uninstall library: http
 %RDCMD% %TMP_CONTRIB_DIR%\library\network\protocol\http
 echo Uninstall library: content_negotiation