aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-05-05 17:22:43 +0100
committerMatthew Wild <mwild1@gmail.com>2010-05-05 17:22:43 +0100
commit28942eed12a9d77431cf4b78814deb63356c751a (patch)
tree5fb75594be09f8b1842028d282e90a0ed19a669c /net
parent1dce4a3033300f40a4b74b286162bab34337f9bb (diff)
parent4af6813db9ffa6dcacd2eb20417ca4667159f9af (diff)
downloadprosody-28942eed12a9d77431cf4b78814deb63356c751a.tar.gz
prosody-28942eed12a9d77431cf4b78814deb63356c751a.zip
Merge 0.7->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server_select.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index 8a4d917d..e66f105b 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -632,7 +632,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
listeners.onconnect(handler);
handler.sendbuffer = _sendbuffer;
if bufferqueuelen > 0 then
- return _senddbuffer();
+ return _sendbuffer();
end
end
end