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
commitf8c5ee2d1d9a84b8a0304232ff2f989e36553c0f (patch)
treefdb1aeb0883fc10d61a8b906886243471f71b457
parentb41ff3079c09d77011cd6e2b4da9604828860e93 (diff)
parentf3a77676cd0b65a49a5efa488798415f5cb44536 (diff)
downloadprosody-f8c5ee2d1d9a84b8a0304232ff2f989e36553c0f.tar.gz
prosody-f8c5ee2d1d9a84b8a0304232ff2f989e36553c0f.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