diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-26 16:25:17 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-26 16:25:17 +0100 |
| commit | 1e12e0070326cb85095bd48c932c70d975928f95 (patch) | |
| tree | 860acbb782aa41c41e784e9e2b24cddc760392b2 | |
| parent | 9db4ba52f9cbab52721ed819e4e81f3cbd62d106 (diff) | |
| parent | ec56b1a798e4a91ce5beaeeeee5d45847cd38a31 (diff) | |
| download | prosody-1e12e0070326cb85095bd48c932c70d975928f95.tar.gz prosody-1e12e0070326cb85095bd48c932c70d975928f95.zip | |
Merge with backout
| -rw-r--r-- | net/http/server.lua | 4 |
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(); |