diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-01 16:45:49 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-01 16:45:49 +0000 |
| commit | 71c6282016d8bf0d48d35dbc26271e02146e243f (patch) | |
| tree | c44a16562528fa7347459da39aa334cbd609900d | |
| parent | 57b4378dede143f6d824b4326a64df1c7d509baf (diff) | |
| parent | f1871510b798f5dbe8fa6263fe2e9478c1cdac6d (diff) | |
| download | prosody-71c6282016d8bf0d48d35dbc26271e02146e243f.tar.gz prosody-71c6282016d8bf0d48d35dbc26271e02146e243f.zip | |
Merge with 0.7
| -rw-r--r-- | net/server_event.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index d041ae43..70435f38 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -671,16 +671,16 @@ do 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 |