projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.10->trunk
[prosody.git]
/
net
/
server_select.lua
diff --git
a/net/server_select.lua
b/net/server_select.lua
index 4a36617cf2f34bfaea531621b3a4f0dcfed8f339..06deec322a491912814c145cca2851166362e6ee 100644
(file)
--- a/
net/server_select.lua
+++ b/
net/server_select.lua
@@
-710,6
+710,7
@@
local function link(sender, receiver, buffersize)
sender:lock_read(true);
end
end
sender:lock_read(true);
end
end
+ sender:set_mode("*a");
end
----------------------------------// PUBLIC //--
end
----------------------------------// PUBLIC //--
@@
-966,7
+967,7
@@
local addclient = function( address, port, listeners, pattern, sslctx, typ )
end
client:settimeout( 0 )
local ok, err = client:connect( address, port )
end
client:settimeout( 0 )
local ok, err = client:connect( address, port )
- if ok or err == "timeout" then
+ if ok or err == "timeout"
or err == "Operation already in progress"
then
return wrapclient( client, address, port, listeners, pattern, sslctx )
else
return nil, err
return wrapclient( client, address, port, listeners, pattern, sslctx )
else
return nil, err