Fixed regression with persistent connection, be sure to keep the remote_info data for all successive requests within a same persistent connection.

examples/desktop_app/desktop_app.ecf

@@ -1,13 +1,13 @@
 <?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="desktop_app" uuid="E015841A-D456-46E1-8A18-E0CEB9E69CD5">
+<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="desktop_app" uuid="E015841A-D456-46E1-8A18-E0CEB9E69CD5">
 	<description>Vision2+web browser widget+embedded web service</description>
 	<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" void_safety="transitional" syntax="transitional">
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="transitional">
 			<assertions precondition="true" postcondition="true" check="true"/>
 		</option>
-		<setting name="concurrency" value="thread"/>
+		<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"/>
@@ -18,9 +18,9 @@
 		<library name="wsf_standalone_connector" location="..\..\library\server\ewsgi\connectors\standalone\standalone-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true">
 			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
 				<exclude>/.svn$</exclude>
+				<exclude>/CVS$</exclude>
+				<exclude>/EIFGENs$</exclude>
 			</file_rule>
 		</cluster>
 	</target>

examples/desktop_app/src/desktop_app.e

@@ -24,20 +24,25 @@ feature {NONE} -- Initialization
 			-- then launch the application.
 		local
 			l_win: like main_window
-			l_embedded_service: APP_EMBEDDED_WEB_SERVICE
+			l_embedded_service: separate APP_EMBEDDED_WEB_SERVICE
 		do
 			default_create
 			create l_win.make
 			main_window := l_win
 			l_win.show
 			create l_embedded_service.make
-			l_embedded_service.set_port_number (0) -- Use first available port number
+			setup_and_launch_web_service (l_embedded_service)
-
-			l_embedded_service.on_launched_actions.force (agent on_web_service_launched (l_win, l_embedded_service))
-			l_embedded_service.launch
 			launch
 		end
 
+
+	setup_and_launch_web_service (a_web_service: separate APP_EMBEDDED_WEB_SERVICE)
+		do
+			a_web_service.set_port_number (0) -- Use first available port number
+			a_web_service.set_on_launched_action (agent on_web_service_launched (a_web_service))
+			a_web_service.launch
+		end
+
 	on_quit
 		do
 			if attached main_window as win then
@@ -45,13 +50,15 @@ feature {NONE} -- Initialization
 			end
 		end
 
-	on_web_service_launched (a_win: attached like main_window; s: APP_EMBEDDED_WEB_SERVICE)
+	on_web_service_launched (a_web_service: separate APP_EMBEDDED_WEB_SERVICE)
 		do
-			add_idle_action_kamikaze (agent wait_for_termination (s, Void))
+			if attached main_window as win then
-			add_idle_action_kamikaze (agent a_win.open_link)
+				add_idle_action_kamikaze (agent wait_for_termination (a_web_service, Void))
+				add_idle_action_kamikaze (agent win.open_link)
+			end
 		end
 
-	wait_for_termination (s: APP_EMBEDDED_WEB_SERVICE; a_timeout: detachable EV_TIMEOUT)
+	wait_for_termination (a_web_service: separate APP_EMBEDDED_WEB_SERVICE; a_timeout: detachable EV_TIMEOUT)
 		local
 			t: detachable EV_TIMEOUT
 		do
@@ -60,7 +67,7 @@ feature {NONE} -- Initialization
 				t.set_interval (0)
 			end
 			if
-				attached s.observer as obs and then
+				attached a_web_service.observer as obs and then
 				observer_has_terminaded (obs)
 			then
 				if t /= Void then
@@ -70,7 +77,7 @@ feature {NONE} -- Initialization
 			else
 				if t = Void then
 					create t
-					t.actions.extend (agent wait_for_termination (s, t))
+					t.actions.extend (agent wait_for_termination (a_web_service, t))
 				else
 					t.set_interval (1_000)
 				end

examples/desktop_app/src/service/embedded_web_execution.e

@@ -17,19 +17,21 @@ inherit
 
 feature {NONE} -- Execution
 
-	execute_embedded 
+	execute_embedded
 			-- Execute the request
 			-- See `request.input' for input stream
     		--     `request.meta_variables' for the CGI meta variable
 			-- and `response' for output buffer
 		local
-			filter: WSF_AGENT_FILTER
 			m: WSF_PAGE_RESPONSE
 		do
 			if local_connection_restriction_enabled then
 				if
 					attached request.remote_addr as l_remote_addr and then
-					l_remote_addr.is_case_insensitive_equal_general ("127.0.0.1")
+					(
+						l_remote_addr.is_case_insensitive_equal_general ("127.0.0.1")
+						or else l_remote_addr.is_case_insensitive_equal_general ("localhost")
+					)
 				then
 					execute
 				else
@@ -41,7 +43,7 @@ feature {NONE} -- Execution
 				execute
 			end
 		end
-	
+
 	execute
 		deferred
 		end

examples/desktop_app/src/service/embedded_web_service.e

@@ -16,7 +16,6 @@ feature -- Initialization
 
 	make
 		do
-			create on_launched_actions
 		end
 
 feature -- Execution
@@ -27,7 +26,6 @@ feature -- Execution
 			opts: WSF_SERVICE_LAUNCHER_OPTIONS
 		do
 			create opts.default_create
-			opts.set_verbose (True)
 			opts.set_option ("port", port_number)
 			create launcher.make (opts)
 			observer := launcher.connector.observer
@@ -40,11 +38,23 @@ feature -- Execution
 	on_launched (conn: WGI_STANDALONE_CONNECTOR [G])
 		do
 			set_port_number (conn.port)
-			on_launched_actions.call (Void)
+			if attached on_launched_action as act then
+				call_action (act)
+			end
+		end
+
+	call_action (act: attached like on_launched_action)
+		do
+			act.call (Void)
 		end
 
 feature -- Access
 
-	on_launched_actions: ACTION_SEQUENCE [TUPLE]
+	on_launched_action: detachable separate PROCEDURE [ANY, TUPLE]
+
+	set_on_launched_action (act: like on_launched_action)
+		do
+			on_launched_action := act
+		end
 
 end

library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_i.e

@@ -31,7 +31,7 @@ feature {NONE} -- Initialization
 
 	reset
 		do
-			reset_request
+			reset_request (False)
 
 			reset_error
 			if attached internal_client_socket as l_sock then
@@ -40,10 +40,18 @@ feature {NONE} -- Initialization
 			internal_client_socket := Void
 		end
 
-	reset_request
+	reset_request (a_is_reusing_connection: BOOLEAN)
+			-- Reset the request, and `a_is_reusing_connection' says if the peristent connection is
+			-- still alive.
 		do
+			if a_is_reusing_connection then
+					-- Keep `remote_info' as it stays the same for the successive 
+					-- persistent connections.
+			else
+				remote_info := Void
+			end
+
 			version := Void
-			remote_info := Void
 
 				-- FIXME: optimize to just wipe_out if needed
 			create method.make_empty
@@ -247,7 +255,7 @@ feature -- Execution
 						or not is_next_persistent_connection_supported -- related to `max_keep_alive_requests'
 						or not is_persistent_connection_requested
 						or has_error or l_socket.is_closed or not l_socket.is_open_read
-				reset_request
+				reset_request (not l_exit)
 			end
 			if l_exit and has_error and not l_socket.is_closed then
 				l_socket.close
@@ -261,6 +269,7 @@ feature -- Execution
 			is_connected: is_connected
 			reuse_connection_when_possible: a_is_reusing_connection implies is_persistent_connection_supported
 			no_error: not has_error
+			remote_info_set: remote_info /= Void
 		local
 			l_socket: like client_socket
 		do