aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-07-22 20:29:41 +0200
committerKim Alvefur <zash@zash.se>2013-07-22 20:29:41 +0200
commit935cf8ba76b20eb03b4f6dfa09bfb8e165d2baab (patch)
tree4c9f44f3548eb4deb16319ad3b8c7c4128c6b771
parente5f6bd8c4cda458ae25900c74b4c751913829dd3 (diff)
parent4b01c2691b2d731c7cf9a60d063010515ad731de (diff)
downloadprosody-935cf8ba76b20eb03b4f6dfa09bfb8e165d2baab.tar.gz
prosody-935cf8ba76b20eb03b4f6dfa09bfb8e165d2baab.zip
Merge 0.9->trunk
-rw-r--r--net/http/server.lua2
-rw-r--r--net/server_event.lua1
2 files changed, 2 insertions, 1 deletions
diff --git a/net/http/server.lua b/net/http/server.lua
index dec7da19..0f379e96 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -168,7 +168,7 @@ function handle_request(conn, request, finish_cb)
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;
diff --git a/net/server_event.lua b/net/server_event.lua
index dc48e338..9f479d5b 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -485,6 +485,7 @@ do
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