Software / code / prosody
Changeset
4111:4716c7645ad2
net.server_select, net.server_event: Silence 'error during ssl handshake' for wantread and wantwrite
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 11 Jan 2011 05:04:08 +0000 |
| parents | 4109:d26db1f936f8 |
| children | 4112:09f0ba0cfbfc |
| files | net/server_event.lua net/server_select.lua |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_event.lua Tue Jan 11 04:19:26 2011 +0000 +++ b/net/server_event.lua Tue Jan 11 05:04:08 2011 +0000 @@ -221,12 +221,12 @@ 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
--- a/net/server_select.lua Tue Jan 11 04:19:26 2011 +0000 +++ b/net/server_select.lua Tue Jan 11 05:04:08 2011 +0000 @@ -530,7 +530,6 @@ _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 @@ _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
