From 63cd0610ec03939574ed9b1319fa18ed1bb84d9b Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Tue, 31 May 2011 14:29:16 +0200 Subject: [PATCH 1/2] Fixed remote info computing --- src/http_connection_handler.e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/http_connection_handler.e b/src/http_connection_handler.e index f287232c..bbafc9c3 100644 --- a/src/http_connection_handler.e +++ b/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 From c7440a2ca06e5e4689715cd9dd593cfa4ed340a5 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 1 Jun 2011 19:13:09 +0200 Subject: [PATCH 2/2] Fixed the HTTP_SERVER.shutdown_server --- src/http_handler.e | 1 + src/http_server.e | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/http_handler.e b/src/http_handler.e index 80369127..9a2408dc 100644 --- a/src/http_handler.e +++ b/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 diff --git a/src/http_server.e b/src/http_server.e index f171417c..d644fafa 100644 --- a/src/http_server.e +++ b/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