# HG changeset patch # User Matthew Wild # Date 1387236731 0 # Node ID bd1d1c29a7e782c3827ec950633df539d70c7947 # Parent 51ead0aa3a0258f8587e3f920f10692138403b92# Parent a9abbdeddbf3505ef6b12632364fc8272f56b6ba Merge 0.9->0.10 diff -r 51ead0aa3a02 -r bd1d1c29a7e7 net/http.lua --- a/net/http.lua Mon Dec 16 02:04:16 2013 +0000 +++ b/net/http.lua Mon Dec 16 23:32:11 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 51ead0aa3a02 -r bd1d1c29a7e7 net/server_select.lua --- a/net/server_select.lua Mon Dec 16 02:04:16 2013 +0000 +++ b/net/server_select.lua Mon Dec 16 23:32:11 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