# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1335453917 -3600
# Node ID 4d6ebe54671e422c884fc56f87c405754031ac73
# Parent  9c15fa5192d3b55d98deeea997c156a600a39137# Parent  7dedf8cc173c4a6d83dc7d61084bdd66f16ea028
Merge with backout

diff -r 9c15fa5192d3 -r 4d6ebe54671e net/http/server.lua
--- a/net/http/server.lua	Thu Apr 26 16:11:08 2012 +0100
+++ b/net/http/server.lua	Thu Apr 26 16:25:17 2012 +0100
@@ -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 @@
 	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();