# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1374517781 -7200
# Node ID 61521ce49aae6c62a871203a15f77f295edb7145
# Parent  11cb5f64d0291642846d20b962a6b9d8f50dc3cc# Parent  9a9c2c254412d0c8560c53cb5ee66bcd902bf777
Merge 0.9->trunk

diff -r 11cb5f64d029 -r 61521ce49aae net/http/server.lua
--- 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;
diff -r 11cb5f64d029 -r 61521ce49aae net/server_event.lua
--- 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