Software / code / prosody
Changeset
5756:61521ce49aae
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 22 Jul 2013 20:29:41 +0200 |
| parents | 5753:11cb5f64d029 (current diff) 5755:9a9c2c254412 (diff) |
| children | 5759:767e29b2cd3a |
| files | net/server_event.lua |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/net/http/server.lua Mon Jul 15 23:43:37 2013 +0100 +++ b/net/http/server.lua Mon Jul 22 20:29:41 2013 +0200 @@ -168,7 +168,7 @@ local conn_header = request.headers.connection; conn_header = conn_header and ","..conn_header:gsub("[ \t]", ""):lower().."," or "" local httpversion = request.httpversion - local persistent = conn_header:find(",Keep-Alive,", 1, true) + local persistent = conn_header:find(",keep-alive,", 1, true) or (httpversion == "1.1" and not conn_header:find(",close,", 1, true)); local response_conn_header;
--- a/net/server_event.lua Mon Jul 15 23:43:37 2013 +0100 +++ b/net/server_event.lua Mon Jul 22 20:29:41 2013 +0200 @@ -485,6 +485,7 @@ onincoming = listener.onincoming; -- will be called when client sends data 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 onstatus = listener.onstatus; -- called for status changes (e.g. of SSL/TLS) eventread = false, eventwrite = false, eventclose = false, eventhandshake = false, eventstarthandshake = false; -- event handler
