diff options
author | Matthew Wild <mwild1@gmail.com> | 2020-07-07 13:52:45 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2020-07-07 13:52:45 +0100 |
commit | 15fef28efb6f5f17cd51a711c80d94fb0ff54bff (patch) | |
tree | b4e288ebff9a45c6b6674f679d5fa15d83678ad8 | |
parent | 72129eca1ca71a0e534ec889a7dec14a50885870 (diff) | |
parent | 4c8ea3a4148e4cf2ea7caddd68bfe9fde8f5787f (diff) | |
download | prosody-15fef28efb6f5f17cd51a711c80d94fb0ff54bff.tar.gz prosody-15fef28efb6f5f17cd51a711c80d94fb0ff54bff.zip |
Merge 0.11->trunk
-rw-r--r-- | net/http.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/http.lua b/net/http.lua index 5fbed4fe..17c755cf 100644 --- a/net/http.lua +++ b/net/http.lua @@ -185,14 +185,15 @@ end 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 |