aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-09-21 22:14:40 +0200
committerKim Alvefur <zash@zash.se>2018-09-21 22:14:40 +0200
commita31b6728d47b09b101f751db192cc9e781f34b66 (patch)
tree4a0a03ae857fc3a35b08e359714cb405ec8af405 /net
parent83cd0e7ba79e37d9f078e8272adedba69dc3bb7f (diff)
downloadprosody-a31b6728d47b09b101f751db192cc9e781f34b66.tar.gz
prosody-a31b6728d47b09b101f751db192cc9e781f34b66.zip
Revert 2dc7490899ae::5d6b252bc36f: Unfinished and broken
Diffstat (limited to 'net')
-rw-r--r--net/http/server.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/http/server.lua b/net/http/server.lua
index 2d9eed21..877c7f17 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -219,7 +219,7 @@ function handle_request(conn, request, finish_cb)
err_code, err = 400, "Invalid path";
elseif not hosts[host] then
if hosts[default_host] then
- request.host = default_host;
+ host = default_host;
elseif host then
err_code, err = 404, "Unknown host: "..host;
else
@@ -233,7 +233,7 @@ function handle_request(conn, request, finish_cb)
return;
end
- local event = request.method.." "..request.path:match("[^?]*");
+ local event = request.method.." "..host..request.path:match("[^?]*");
local payload = { request = request, response = response };
log("debug", "Firing event: %s", event);
local result = events.fire_event(event, payload);