net.server_select, net.server_event: Rename :pattern() method to :set_mode() for...

diff --git a/net/server_event.lua b/net/server_event.lua
index c28c5ce247efdb89751e17720e336eda6b682b62..bbc9a527857f1cb1cc14ce275d25de3f17e70973 100644 (file)
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -402,6 +402,13 @@ do
                        self.starttls = false; -- prevent starttls()
                end
        end
+
+       function interface_mt:set_mode(pattern)
+               if pattern then
+                       self._pattern = pattern;
+               end
+               return self._pattern;
+       end
        
        function interface_mt:set_send(new_send)
                -- No-op, we always use the underlying connection's send
@@ -599,7 +606,7 @@ do
                                                interface.eventreadtimeout = nil
                                        end
                                end
-                               local buffer, err, part = interface.conn:receive( pattern )  -- receive buffer with "pattern"
+                               local buffer, err, part = interface.conn:receive( interface._pattern )  -- receive buffer with "pattern"
                                --vdebug( "read data:", tostring(buffer), "error:", tostring(err), "part:", tostring(part) )
                                buffer = buffer or part or ""
                                local len = string_len( buffer )

diff --git a/net/server_select.lua b/net/server_select.lua
index 6d6f7fbcfde5eafb95a9e37ba3b8bd8df16b22cd..475e8aca1ca5e0f3b171967a3632dbd3c266863b 100644 (file)
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -379,7 +379,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
        handler.socket = function( self )
                return socket
        end
-       handler.pattern = function( self, new )
+       handler.set_mode = function( self, new )
                pattern = new or pattern
                return pattern
        end