# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1267461949 0
# Node ID aab12281488fe8db29ea6f2c95a21be614c7b90a
# Parent  f96394ad5ab746d563067ae1c849b5c2570f5534# Parent  1b9179e0423348c2d10e49b7bb352c634a9a5dda
Merge with 0.7

diff -r f96394ad5ab7 -r aab12281488f net/server_event.lua
--- a/net/server_event.lua	Mon Mar 01 16:23:51 2010 +0000
+++ b/net/server_event.lua	Mon Mar 01 16:45:49 2010 +0000
@@ -671,16 +671,16 @@
 					debug( "maximal connections reached, refuse client connection; accept delay:", delay )
 					return EV_TIMEOUT, delay  -- delay for next accept attemp
 				end
-				local ip, port = client:getpeername( )
+				local client_ip, client_port = client:getpeername( )
 				interface._connections = interface._connections + 1  -- increase connection count
-				local clientinterface = handleclient( client, ip, port, interface, pattern, listener, nil, sslctx )
+				local clientinterface = handleclient( client, client_ip, client_port, interface, pattern, listener, nil, sslctx )
 				--vdebug( "client id:", clientinterface, "startssl:", startssl )
 				if ssl and sslctx then
 					clientinterface:starttls(sslctx)
 				else
 					clientinterface:_start_session( clientinterface.onconnect )
 				end
-				debug( "accepted incoming client connection from:", ip, port )
+				debug( "accepted incoming client connection from:", client_ip or "<unknown IP>", client_port or "<unknown port>", "to", port or "<unknown port>");
 				
 				client, err = server:accept()    -- try to accept again
 			end