diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-09-21 14:42:29 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-09-21 14:42:29 +0100 |
| commit | 3f47ff7634d43c5e8c4dcbc502344cd53d6ffcb4 (patch) | |
| tree | 73510b521fc690f45cefeac2d0b61411ed51247a /net | |
| parent | 9b64edcf81c16e0aaee7456306cfd991cd2332d8 (diff) | |
| parent | 46e4ac25f4f8e0ba69a3b852573dd5892406fd00 (diff) | |
| download | prosody-3f47ff7634d43c5e8c4dcbc502344cd53d6ffcb4.tar.gz prosody-3f47ff7634d43c5e8c4dcbc502344cd53d6ffcb4.zip | |
Merge with 0.5
Diffstat (limited to 'net')
| -rw-r--r-- | net/dns.lua | 1 | ||||
| -rw-r--r-- | net/server.lua | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/dns.lua b/net/dns.lua index ff07d26e..b5f87ad2 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -504,6 +504,7 @@ function resolver:setnameserver (address) -- - - - - - - - - - setnameserver function resolver:adddefaultnameservers () -- - - - - adddefaultnameservers + self:addnameserver("4.2.2.1"); do return; end local resolv_conf = io.open("/etc/resolv.conf"); if resolv_conf then for line in resolv_conf:lines() do diff --git a/net/server.lua b/net/server.lua index 65567d15..66272ccc 100644 --- a/net/server.lua +++ b/net/server.lua @@ -363,6 +363,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport send( socket, table_concat( bufferqueue, "", 1, bufferqueuelen ), 1, bufferlen ) -- forced send
end
end
+ if not handler then return true; end
_ = shutdown and shutdown( socket )
socket:close( )
_sendlistlen = removesocket( _sendlist, socket, _sendlistlen )
|