Merge branch 'jocelyn'

src/http_connection_handler.e

@@ -47,7 +47,7 @@ feature -- Execution
 
 
 			create l_remote_info
-			if attached client_socket.address as l_addr then
+			if attached client_socket.peer_address as l_addr then
 				l_remote_info.addr := l_addr.host_address.host_address
 				l_remote_info.hostname := l_addr.host_address.host_name
 				l_remote_info.port := l_addr.port

src/http_handler.e

@@ -60,6 +60,7 @@ feature -- Inherited Features
 							end
 						end
 					end
+					is_stop_requested := main_server.stop_requested
 				end
 				l_http_socket.cleanup
 				check

src/http_server.e

@@ -49,17 +49,4 @@ feature	-- Access
 	stop_requested: BOOLEAN
 			-- Stops the server
 
-feature {NONE} -- implementation
-
-	run
-		-- Start the server
-		local
-			e: EXECUTION_ENVIRONMENT
-		do
-			create e
-			from until stop_requested loop
-				e.sleep (1_000_000)
-			end
-		end
-
 end