diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2012-12-03 10:04:34 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2012-12-03 10:04:34 +0500 |
| commit | a89701cbd8943fe768a38ecd06e6ea954ec7d7ca (patch) | |
| tree | 04c8fa7215db782cc848ff26a081da51d36d205e | |
| parent | 3f690f3c1dcf3d77e2d3ee818ec2b3bd52a47d55 (diff) | |
| parent | 36df4aa5d680b19acfbda49200feba54da3097c4 (diff) | |
| download | prosody-a89701cbd8943fe768a38ecd06e6ea954ec7d7ca.tar.gz prosody-a89701cbd8943fe768a38ecd06e6ea954ec7d7ca.zip | |
Merge 0.9->trunk.
| -rw-r--r-- | net/http/parser.lua | 2 | ||||
| -rw-r--r-- | util/xml.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/http/parser.lua b/net/http/parser.lua index 606d750c..c760a0a4 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:gsub("//+". "/"))); + path = urldecode((path:gsub("//+", "/"))); if path:sub(1,1) ~= "/" then path = "/"..path; end diff --git a/util/xml.lua b/util/xml.lua index db446bc3..076490fa 100644 --- a/util/xml.lua +++ b/util/xml.lua @@ -2,7 +2,7 @@ local st = require "util.stanza"; local lxp = require "lxp"; -module("template") +module("xml") local parse_xml = (function() local ns_prefixes = { |