diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-01-11 05:04:08 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-01-11 05:04:08 +0000 |
| commit | 72dc9416ef33f5d42d0959cfc0030c4855ea442d (patch) | |
| tree | 9f919f034f19f9abe791c299ddf03fde8b6fe4d7 | |
| parent | 16e8102a4e0ee8528925952f9b60ef87a4f8aa00 (diff) | |
| download | prosody-72dc9416ef33f5d42d0959cfc0030c4855ea442d.tar.gz prosody-72dc9416ef33f5d42d0959cfc0030c4855ea442d.zip | |
net.server_select, net.server_event: Silence 'error during ssl handshake' for wantread and wantwrite
| -rw-r--r-- | net/server_event.lua | 2 | ||||
| -rw-r--r-- | net/server_select.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 058d51fe..528305d3 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -221,12 +221,12 @@ do self.eventhandshake = nil return -1 end - debug( "error during ssl handshake:", err ) if err == "wantwrite" then event = EV_WRITE elseif err == "wantread" then event = EV_READ else + debug( "ssl handshake error:", err ) self.fatalerror = err end end diff --git a/net/server_select.lua b/net/server_select.lua index cfd7f3cd..c3777a5f 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -530,7 +530,6 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport _readlistlen = addsocket(_readlist, client, _readlistlen) return true else - out_put( "server.lua: error during ssl handshake: ", tostring(err) ) if err == "wantwrite" and not wrote then _sendlistlen = addsocket(_sendlist, client, _sendlistlen) wrote = true @@ -538,6 +537,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport _readlistlen = addsocket(_readlist, client, _readlistlen) read = true else + out_put( "server.lua: ssl handshake error: ", tostring(err) ) break; end --coroutine_yield( handler, nil, err ) -- handshake not finished |