aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-02 22:33:11 +0200
committerKim Alvefur <zash@zash.se>2014-09-02 22:33:11 +0200
commitc80b30a71ceb555bb33d14c3c7dbee0a8c93eaee (patch)
treeb4ffbcba45331b7fa86a9e1d1881e94b8fef9d42 /net
parenta540fdb9f448eb0990899b70e0ed8ab926e979f6 (diff)
parent69d97b4f7ed15249ce71a5b261bff98a008684aa (diff)
downloadprosody-c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee.tar.gz
prosody-c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee.zip
Merge 0.9->0.10
Diffstat (limited to 'net')
-rw-r--r--net/http.lua4
-rw-r--r--net/http/server.lua4
-rw-r--r--net/server_event.lua11
-rw-r--r--net/server_select.lua5
4 files changed, 21 insertions, 3 deletions
diff --git a/net/http.lua b/net/http.lua
index ab9ec7b6..0c0ef967 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -72,6 +72,10 @@ function listener.ondisconnect(conn, err)
requests[conn] = nil;
end
+function listener.ondetach(conn)
+ requests[conn] = nil;
+end
+
local function request_reader(request, data, err)
if not request.parser then
local function error_cb(reason)
diff --git a/net/http/server.lua b/net/http/server.lua
index 09f8d2a4..be870c51 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -142,6 +142,10 @@ function listener.ondisconnect(conn)
sessions[conn] = nil;
end
+function listener.ondetach(conn)
+ sessions[conn] = nil;
+end
+
function listener.onincoming(conn, data)
sessions[conn]:feed(data);
end
diff --git a/net/server_event.lua b/net/server_event.lua
index e10606dd..756e9837 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -438,9 +438,11 @@ do
end
function interface_mt:setlistener(listener)
- self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout, self.onreadtimeout, self.onstatus
- = listener.onconnect, listener.ondisconnect, listener.onincoming,
- listener.ontimeout, listener.onreadtimeout, listener.onstatus;
+ self:ondetach(); -- Notify listener that it is no longer responsible for this connection
+ self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout,
+ self.onreadtimeout, self.onstatus, self.ondetach
+ = listener.onconnect, listener.ondisconnect, listener.onincoming, listener.ontimeout,
+ listener.onreadtimeout, listener.onstatus, listener.ondetach;
end
-- Stub handlers
@@ -460,6 +462,8 @@ do
end
function interface_mt:ondrain()
end
+ function interface_mt:ondetach()
+ end
function interface_mt:onstatus()
end
end
@@ -487,6 +491,7 @@ do
ontimeout = listener.ontimeout; -- called when fatal socket timeout occurs
onreadtimeout = listener.onreadtimeout; -- called when socket inactivity timeout occurs
ondrain = listener.ondrain; -- called when writebuffer is empty
+ ondetach = listener.ondetach; -- called when disassociating this listener from this connection
onstatus = listener.onstatus; -- called for status changes (e.g. of SSL/TLS)
eventread = false, eventwrite = false, eventclose = false,
eventhandshake = false, eventstarthandshake = false; -- event handler
diff --git a/net/server_select.lua b/net/server_select.lua
index 6308e62f..d2192f0a 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -285,6 +285,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
local disconnect = listeners.ondisconnect
local drain = listeners.ondrain
local onreadtimeout = listeners.onreadtimeout;
+ local detach = listeners.ondetach
local bufferqueue = { } -- buffer array
local bufferqueuelen = 0 -- end of buffer array
@@ -316,11 +317,15 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
handler.onreadtimeout = onreadtimeout;
handler.setlistener = function( self, listeners )
+ if detach then
+ detach(self) -- Notify listener that it is no longer responsible for this connection
+ end
dispatch = listeners.onincoming
disconnect = listeners.ondisconnect
status = listeners.onstatus
drain = listeners.ondrain
handler.onreadtimeout = listeners.onreadtimeout
+ detach = listeners.ondetach
end
handler.getstats = function( )
return readtraffic, sendtraffic