Merge 0.9->trunk.
--- a/net/http/parser.lua Mon Dec 03 06:07:00 2012 +0500
+++ b/net/http/parser.lua Mon Dec 03 10:04:34 2012 +0500
@@ -5,7 +5,7 @@
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
--- a/util/xml.lua Mon Dec 03 06:07:00 2012 +0500
+++ b/util/xml.lua Mon Dec 03 10:04:34 2012 +0500
@@ -2,7 +2,7 @@
local st = require "util.stanza";
local lxp = require "lxp";
-module("template")
+module("xml")
local parse_xml = (function()
local ns_prefixes = {