aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-04-26 16:25:17 +0100
committerMatthew Wild <mwild1@gmail.com>2012-04-26 16:25:17 +0100
commit26768dfb4dd3682d63b9715c8942b827d52ffd12 (patch)
tree860acbb782aa41c41e784e9e2b24cddc760392b2
parenta54e59650fb3aef98485286f3ffaf5cdf6140dab (diff)
parent887ca5f9fe8ae6730f72c2aea17aaf84ccb8a537 (diff)
downloadprosody-26768dfb4dd3682d63b9715c8942b827d52ffd12.tar.gz
prosody-26768dfb4dd3682d63b9715c8942b827d52ffd12.zip
Merge with backout
-rw-r--r--net/http/server.lua4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/http/server.lua b/net/http/server.lua
index 938e676d..d693fb52 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -1,7 +1,6 @@
local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
local parser_new = require "net.http.parser".new;
-local url_parse = require "socket.url".parse;
local events = require "util.events".new();
local addserver = require "net.server".addserver;
local log = require "util.logger".init("http.server");
@@ -107,9 +106,6 @@ function listener.onconnect(conn)
local function success_cb(request)
--log("debug", "success_cb: %s", request.path);
request.secure = secure;
- local parsed_dest = url_parse(request.path);
- request.url = parsed_dest;
- request.path = parsed_dest.path;
t_insert(pending, request);
if not waiting then
process_next();