diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-01-11 05:31:29 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-01-11 05:31:29 +0000 |
| commit | d9b4efc92495618c728a791747a78b36e40a821e (patch) | |
| tree | 9955881f795b0517126ec0fc67fe0982f212102a /net | |
| parent | da14cbf95f70cba5770251871971197bde6fde79 (diff) | |
| parent | 42e80ba8932b6c830845c0e5f01539740975f86c (diff) | |
| download | prosody-d9b4efc92495618c728a791747a78b36e40a821e.tar.gz prosody-d9b4efc92495618c728a791747a78b36e40a821e.zip | |
Merge 0.8->trunk
Diffstat (limited to 'net')
| -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 |