mod_tls: Mark session as not secure before negotiating TLS

[prosody.git] / net / server.lua

diff --git a/net/server.lua b/net/server.lua
index 38d0eab5249e61e74e00d8126b31239f797aa71f..54eadbc617b9f0c06861b2d69dca4681ddbdc696 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -481,10 +481,10 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
             readtraffic = readtraffic + count\r
             _readtraffic = _readtraffic + count\r
             _readtimes[ handler ] = _currenttime\r
-            --out_put( "server.lua: read data '", buffer, "', error: ", err )\r
+            --out_put( "server.lua: read data '", buffer:gsub("[^%w%p ]", "."), "', error: ", err )\r
             return dispatch( handler, buffer, err )\r
         else    -- connections was closed or fatal error\r
-            out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " error: ", tostring(err) )\r
+            out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " read error: ", tostring(err) )\r
             fatalerror = true\r
             disconnect( handler, err )\r
            _ = handler and handler.close( )\r
@@ -521,7 +521,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
             _writetimes[ handler ] = _currenttime\r
             return true\r
         else    -- connection was closed during sending or fatal error\r
-            out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " error: ", tostring(err) )\r
+            out_put( "server.lua: client ", tostring(ip), ":", tostring(clientport), " write error: ", tostring(err) )\r
             fatalerror = true\r
             disconnect( handler, err )\r
             _ = handler and handler.close( )\r
@@ -821,7 +821,7 @@ loop = function( )    -- this is the main loop of the program
         _currenttime = os_time( )\r
         if os_difftime( _currenttime - _timer ) >= 1 then\r
             for i = 1, _timerlistlen do\r
-                _timerlist[ i ]( )    -- fire timers\r
+                _timerlist[ i ]( _currenttime )    -- fire timers\r
             end\r
             _timer = _currenttime\r
         end\r