net.server_select, net.server_event: Support for :pause() and :resume() on connections

diff --git a/net/server_event.lua b/net/server_event.lua
index dde13e615788ed03277cf74cdfaa131844b7c9d7..c28c5ce247efdb89751e17720e336eda6b682b62 100644 (file)
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -282,8 +282,21 @@ do
                        return nointerface, noreading, nowriting
        end
        
+       --TODO: Deprecate
        function interface_mt:lock_read(switch)
-               return self:_lock(self.nointerface, switch, self.nowriting);
+               if switch then
+                       return self:pause();
+               else
+                       return self:resume();
+               end
+       end
+
+       function interface_mt:pause()
+               return self:_lock(self.nointerface, true, self.nowriting);
+       end
+
+       function interface_mt:resume()
+               return self:_lock(self.nointerface, false, self.nowriting);
        end
 
        function interface_mt:counter(c)

diff --git a/net/server_select.lua b/net/server_select.lua
index 94461f4563eb29a6992399383b5a1f1aefcdc712..6d6f7fbcfde5eafb95a9e37ba3b8bd8df16b22cd 100644 (file)
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -392,6 +392,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                maxreadlen = readlen or maxreadlen
                return bufferlen, maxreadlen, maxsendlen
        end
+       --TODO: Deprecate
        handler.lock_read = function (self, switch)
                if switch == true then
                        local tmp = _readlistlen
@@ -409,6 +410,12 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                end
                return noread
        end
+       handler.pause = function (self)
+               return self:lock_read(true);
+       end
+       handler.resume = function (self)
+               return self:lock_read(false);
+       end
        handler.lock = function( self, switch )
                handler.lock_read (switch)
                if switch == true then
@@ -508,9 +515,6 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                                                out_put( "server.lua: ssl handshake done" )
                                                handler.readbuffer = _readbuffer        -- when handshake is done, replace the handshake function with regular functions
                                                handler.sendbuffer = _sendbuffer
-                                               out_put ("server.lua: compression used: "..tostring(client:compression()))
-                                               out_put ("server.lua: finished: "..tostring(client:getfinished()):sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"))
-                                               out_put ("server.lua: peer finished: "..tostring(client:getpeerfinished()):sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"))
                                                _ = status and status( handler, "ssl-handshake-complete" )
                                                _readlistlen = addsocket(_readlist, client, _readlistlen)
                                                return true