Merge 0.9->0.10

diff --cc net/http.lua
index 6ddb19004beb1977b3fe20301487bdbd60ff59b7,5ec3163c06644269a1211e7ff2fdf3c2d796b92c..ab9ec7b6c86f6b4e45c8d8457d0b74bc16ca1b1e
--- 1/net/http.lua
--- 2/net/http.lua
+++ b/net/http.lua
@@@ -174,9 -173,9 +174,9 @@@ function request(u, ex, callback
                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
        req.reader = request_reader;
        req.state = "status";

diff --cc net/server_select.lua
Simple merge