From 74b83382abc15225f5a3e222b26058c459a7b805 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 22 Jul 2013 17:28:37 +0200 Subject: net.http.server: Fix Keep-Alive requests with HTTP 1.0 --- net/http/server.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net') 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; -- cgit v1.2.3 From 4b01c2691b2d731c7cf9a60d063010515ad731de Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 22 Jul 2013 18:17:30 +0200 Subject: net.server_event: Pass ondrain handler from listener --- net/server_event.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'net') diff --git a/net/server_event.lua b/net/server_event.lua index 5eae95a9..e320b15c 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -477,6 +477,7 @@ do ondisconnect = listener.ondisconnect; -- will be called when client disconnects onincoming = listener.onincoming; -- will be called when client sends data ontimeout = listener.ontimeout; -- called when fatal socket 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 -- cgit v1.2.3