# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1354156704 -18000
# Node ID afa9b7e18e43c07bea9130d6a4ea677579613413
# Parent  b4de85209ccfad63448a922e4576c14dcaf88d73# Parent  c5edb08fc7cb8708b4547e9693448433813d2e85
Merge 0.9->trunk

diff -r b4de85209ccf -r afa9b7e18e43 net/http/parser.lua
--- a/net/http/parser.lua	Thu Nov 29 07:17:31 2012 +0500
+++ b/net/http/parser.lua	Thu Nov 29 07:38:24 2012 +0500
@@ -5,7 +5,7 @@
 local urldecode = require "net.http".urldecode;
 
 local function preprocess_path(path)
-	path = urldecode(path);
+	path = urldecode((path:gsub("//+". "/")));
 	if path:sub(1,1) ~= "/" then
 		path = "/"..path;
 	end