Software /
code /
prosody
Diff
net/http.lua @ 8046:1bf47706aefb
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sun, 02 Apr 2017 00:24:37 +0200 |
parent | 7798:74cfec1fe5a2 |
parent | 8045:55a56dc935f2 |
child | 8121:a33a87f13155 |
line wrap: on
line diff
--- a/net/http.lua Sat Apr 01 22:40:09 2017 +0200 +++ b/net/http.lua Sun Apr 02 00:24:37 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