From: Jason Parker <jparker@digium.com>
Date: Wed, 20 Jun 2007 20:41:06 +0000 (+0000)
Subject: Revert the change made in revision 45474, since this causes other issues.
X-Git-Tag: 1.6.0-beta1~3^2~2315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37e66fd859664654eaf2a2c1cfd9099d019d4424;p=thirdparty%2Fasterisk.git

Revert the change made in revision 45474, since this causes other issues.

Issue 10021.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70493 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/http.c b/main/http.c
index c385c34c53..0fafef8030 100644
--- a/main/http.c
+++ b/main/http.c
@@ -145,18 +145,6 @@ static const char *ftype2mtype(const char *ftype, char *wkspace, int wkspacelen)
 	return wkspace;
 }
 
-/* like ast_uri_decode, but replace '+' with ' ' */
-static char *uri_decode(char *buf)
-{
-	char *c;
-	ast_uri_decode(buf);
-	for (c = buf; *c; c++) {
-		if (*c == '+')
-			*c = ' ';
-	}
-	return buf;
-}
-
 static struct ast_str *static_callback(struct sockaddr_in *req, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
 {
 	struct ast_str *result;
@@ -583,7 +571,7 @@ static struct ast_str *handle_uri(struct sockaddr_in *sin, char *uri, int *statu
 		while ((val = strsep(&params, "&"))) {
 			var = strsep(&val, "=");
 			if (val)
-				uri_decode(val);
+				ast_uri_decode(val);
 			else 
 				val = "";
 			ast_uri_decode(var);