# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1387236749 0
# Node ID 09645f58c14c53297a99ec4c10025658194eb491
# Parent  49fb5835965ed4978a953f94a23a79315200ed39# Parent  bd1d1c29a7e782c3827ec950633df539d70c7947
Merge 0.10->trunk

diff -r 49fb5835965e -r 09645f58c14c net/http.lua
--- a/net/http.lua	Mon Dec 16 02:05:16 2013 +0000
+++ b/net/http.lua	Mon Dec 16 23:32:29 2013 +0000
@@ -20,6 +20,7 @@
 local pairs = pairs;
 local tonumber, tostring, xpcall, select, traceback =
       tonumber, tostring, xpcall, select, debug.traceback;
+local assert, error = assert, error
 
 local log = require "util.logger".init("http");
 
@@ -173,7 +174,7 @@
 		sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2" } };
 	end
 
-	req.handler, req.conn = server.wrapclient(conn, host, port_number, listener, "*a", sslctx);
+	req.handler, req.conn = assert(server.wrapclient(conn, host, port_number, listener, "*a", sslctx));
 	req.write = function (...) return req.handler:write(...); end
 
 	req.callback = function (content, code, request, response) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request, response) end, handleerr)); end
diff -r 49fb5835965e -r 09645f58c14c net/server_select.lua
--- a/net/server_select.lua	Mon Dec 16 02:05:16 2013 +0000
+++ b/net/server_select.lua	Mon Dec 16 23:32:29 2013 +0000
@@ -920,13 +920,9 @@
 			-- When socket is writeable, call onconnect
 			local _sendbuffer = handler.sendbuffer;
 			handler.sendbuffer = function ()
-				_sendlistlen = removesocket( _sendlist, socket, _sendlistlen );
 				handler.sendbuffer = _sendbuffer;
 				listeners.onconnect(handler);
-				-- If there was data with the incoming packet, handle it now.
-				if #handler:bufferqueue() > 0 then
-					return _sendbuffer();
-				end
+				return _sendbuffer(); -- Send any queued outgoing data
 			end
 		end
 	end