prosody
ba51d0917c64

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

5224:ba51d0917c64

Merge 0.9->trunk.
author Waqas Hussain <waqas20@gmail.com>
date Mon, 03 Dec 2012 10:04:34 +0500
parents 5221:115cf8252be8 (current diff) 5223:76e4651142e1 (diff)
children 5226:c918aafb9c2e
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 = {