diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2013-01-22 08:30:38 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2013-01-22 08:30:38 +0500 |
| commit | 0f2d3d7139c741b6bd8714048694ee16a9b11c91 (patch) | |
| tree | 9938dd9411cf02b2c7cc7a82103633f7378030b8 /net/server_select.lua | |
| parent | 1ae08f23d712da167747a7d59feac9965d6ef9ac (diff) | |
| parent | b1f22daa932ac857022412e734533ff05bad1594 (diff) | |
| download | prosody-0f2d3d7139c741b6bd8714048694ee16a9b11c91.tar.gz prosody-0f2d3d7139c741b6bd8714048694ee16a9b11c91.zip | |
Merge 0.9->trunk
Diffstat (limited to 'net/server_select.lua')
| -rw-r--r-- | net/server_select.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_select.lua b/net/server_select.lua index 97b9f199..0852d444 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -74,6 +74,7 @@ local idfalse local closeall local addsocket local addserver +local addtimer local getserver local wrapserver local getsettings @@ -237,7 +238,6 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco local client, err = accept( socket ) -- try to accept if client then local ip, clientport = client:getpeername( ) - client:settimeout( 0 ) local handler, client, err = wrapconnection( handler, listeners, client, ip, serverport, clientport, pattern, sslctx ) -- wrap new client socket if err then -- error while wrapping ssl socket return false |