net.server_event: Fix some global accesses
authorMatthew Wild <mwild1@gmail.com>
Mon, 1 Mar 2010 18:46:37 +0000 (18:46 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 1 Mar 2010 18:46:37 +0000 (18:46 +0000)
net/server_event.lua

index 70435f38306029c2fe3ae4b0a52990e3d85adde2..b767cb20f62e1ce76fbec47648a5b10b460f96b0 100644 (file)
@@ -543,7 +543,7 @@ do
                                                local callback = function( )
                                                        interface:_close()
                                                        interface.eventwritetimeout = nil
-                                                       return evreturn, evtimeout
+                                                       return -1;
                                                end
                                                interface.eventwritetimeout = addevent( base, nil, EV_TIMEOUT, callback, cfg.WRITE_TIMEOUT )  -- reg a new timeout event
                                                debug( "wantread during write attemp, reg it in readcallback but dont know what really happens next..." )
@@ -762,7 +762,7 @@ do
                        local server = function( )
                                return nil, "this is a dummy server interface"
                        end
-                       local interface = wrapclient( client, ip, serverport, listeners, pattern, sslctx, startssl )
+                       local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx, startssl )
                        interface:_start_connection( startssl )
                        debug( "new connection id:", interface.id )
                        return interface, err