# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1594126365 -3600
# Node ID e18a913aed2d4e9b29b2514ed42454016b63c8ad
# Parent  b5e7f4d533e21e2b6c46ca85e31869c1772d51d0# Parent  e2ce067bb59a1443a92c32244fa684464a08c49b
Merge 0.11->trunk

diff -r b5e7f4d533e2 -r e18a913aed2d net/http.lua
--- a/net/http.lua	Thu Jul 02 19:03:59 2020 +0200
+++ b/net/http.lua	Tue Jul 07 13:52:45 2020 +0100
@@ -185,14 +185,15 @@
 
 local function request(self, u, ex, callback)
 	local req = url.parse(u);
-	req.url = u;
-	req.http = self;
 
 	if not (req and req.host) then
 		callback("invalid-url", 0, req);
 		return nil, "invalid-url";
 	end
 
+	req.url = u;
+	req.http = self;
+
 	if not req.path then
 		req.path = "/";
 	end