# HG changeset patch # User Kim Alvefur # Date 1491085447 -7200 # Node ID 55a56dc935f2217da1ae72c48ed089f6a184a0f8 # Parent 5d5afaafac0f9da73eb63c33b6a282ed56349871 net.http: Pass error all the way to callback diff -r 5d5afaafac0f -r 55a56dc935f2 net/http.lua --- a/net/http.lua Sat Apr 01 22:34:15 2017 +0200 +++ b/net/http.lua Sun Apr 02 00:24:07 2017 +0200 @@ -68,7 +68,7 @@ function listener.ondisconnect(conn, err) local request = requests[conn]; if request and request.conn then - request:reader(nil, err); + request:reader(nil, err or "closed"); end requests[conn] = nil; end @@ -126,7 +126,7 @@ local req = url.parse(u); if not (req and req.host) then - callback(nil, 0, req); + callback("invalid-url", 0, req); return nil, "invalid-url"; end @@ -190,7 +190,7 @@ local handler, conn = server.addclient(host, port_number, listener, "*a", sslctx) if not handler then - callback(nil, 0, req); + callback(conn, 0, req); return nil, conn; end req.handler, req.conn = handler, conn diff -r 5d5afaafac0f -r 55a56dc935f2 net/http/parser.lua --- a/net/http/parser.lua Sat Apr 01 22:34:15 2017 +0200 +++ b/net/http/parser.lua Sun Apr 02 00:24:07 2017 +0200 @@ -46,7 +46,7 @@ packet.body = buf; success_cb(packet); elseif buf ~= "" then -- unexpected EOF - error = true; return error_cb(); + error = true; return error_cb("unexpected-eof"); end return; end