mod_storage_sql: Fix commit c806a599224a for compatibility with non-MySQL databases...

[prosody.git] / net / server_event.lua

diff --git a/net/server_event.lua b/net/server_event.lua
index d2d40374e2f4be4592e0f461312ab48a470d79ad..528305d327c06e918a523cad8420133445d8aa91 100644 (file)
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -162,10 +162,7 @@ do
                                --vdebug( "start listening on client socket with id:", self.id )
                                self.eventread = addevent( base, self.conn, EV_READ, self.readcallback, cfg.READ_TIMEOUT );  -- register callback
                                if call_onconnect then
-                                       debug("CALLING ONCONNECT")
                                        self:onconnect()
-                               else
-                                       debug("NOT CALLING ONCONNECT");
                                end
                                self.eventsession = nil
                                return -1
@@ -224,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
@@ -364,6 +361,10 @@ do
                end
        end
        
+       function interface_mt:socket()
+               return self.conn
+       end
+       
        function interface_mt:server()
                return self._server or self;
        end
@@ -725,7 +726,7 @@ local addserver = ( function( )
                --vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslcfg or "nil", startssl or "nil")
                local server, err = socket.bind( addr, port, cfg.ACCEPT_QUEUE )  -- create server socket
                if not server then
-                       debug( "creating server socket failed because:", err )
+                       debug( "creating server socket on "..addr.." port "..port.." failed:", err )
                        return nil, err
                end
                local sslctx
@@ -847,7 +848,6 @@ function hook_signal(signal_num, handler)
 end
 
 local function link(sender, receiver, buffersize)
-       sender:set_mode(buffersize);
        local sender_locked;
        
        function receiver:ondrain()