aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-11-13 15:03:53 +0000
committerMatthew Wild <mwild1@gmail.com>2018-11-13 15:03:53 +0000
commitc17601c7880a70325ee35a581183722c420e2475 (patch)
treefdb1aeb0883fc10d61a8b906886243471f71b457
parenta4056f992c75e45b39769fdbeb201461e62a0359 (diff)
parent8ebaee9c3d614a5ec32270108f1c45258939a7e8 (diff)
downloadprosody-c17601c7880a70325ee35a581183722c420e2475.tar.gz
prosody-c17601c7880a70325ee35a581183722c420e2475.zip
Merge 0.11->trunk
-rw-r--r--net/http/server.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http/server.lua b/net/http/server.lua
index 7fbf6377..9b63d516 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -236,7 +236,6 @@ function handle_request(conn, request, finish_cb)
err_code, err = 400, "Missing or invalid 'Host' header";
end
end
- local host_event = request.method.." "..host..request.path:match("[^?]*");
if err then
response.status_code = err_code;
@@ -244,6 +243,7 @@ function handle_request(conn, request, finish_cb)
return;
end
+ local host_event = request.method.." "..host..request.path:match("[^?]*");
log("debug", "Firing event: %s", host_event);
result = events.fire_event(host_event, payload);
end