net.server_select, net.server_event: Silence 'error during ssl handshake' for wantrea...
authorMatthew Wild <mwild1@gmail.com>
Tue, 11 Jan 2011 05:04:08 +0000 (05:04 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 11 Jan 2011 05:04:08 +0000 (05:04 +0000)
net/server_event.lua
net/server_select.lua

index 058d51fe38d079ca8e5d1229b3d72d6aa3585edb..528305d327c06e918a523cad8420133445d8aa91 100644 (file)
@@ -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
index cfd7f3cd98c0c18489fdcdd8ed9732b1979a3d11..c3777a5ff626783d6634be9ebe01041c9689d01f 100644 (file)
@@ -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