aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-11-29 07:38:24 +0500
committerMatthew Wild <mwild1@gmail.com>2012-11-29 07:38:24 +0500
commitcbf14003e96012cf10c734f7d7442e416bf1d125 (patch)
tree712857a3bd16fac6f602f64d2bb6a419bd18b9f6 /net
parent7af40420b5574923b049df28b49f8341bfcf38b1 (diff)
parent753581cc0d82e90383873958a36cd236e5623cbe (diff)
downloadprosody-cbf14003e96012cf10c734f7d7442e416bf1d125.tar.gz
prosody-cbf14003e96012cf10c734f7d7442e416bf1d125.zip
Merge 0.9->trunk
Diffstat (limited to 'net')
-rw-r--r--net/http/parser.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http/parser.lua b/net/http/parser.lua
index 964c350d..606d750c 100644
--- a/net/http/parser.lua
+++ b/net/http/parser.lua
@@ -5,7 +5,7 @@ local url_parse = require "socket.url".parse;
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