Software / code / prosody
Changeset
2727:aab12281488f
Merge with 0.7
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Mar 2010 16:45:49 +0000 |
| parents | 2725:f96394ad5ab7 (current diff) 2726:1b9179e04233 (diff) |
| children | 2730:dea5a65b321d |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
