From: Brandon Kruse <bkruse@digium.com>
Date: Fri, 25 Jul 2008 19:12:17 +0000 (+0000)
Subject: Revert tilghman and pari's code changes, as
X-Git-Tag: 1.6.2.0-beta1~1583
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab64d7181adb94f3fbd83d22a92816c98442b503;p=thirdparty%2Fasterisk.git

Revert tilghman and pari's code changes, as
we do NOT need to uri_decode in manager.
(if I sent core%20show%20channels from a telnet
session, it should be interpreted literally, however,
if I send that from an http session, it should be
decoded, which is the behaivor now)


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

diff --git a/main/manager.c b/main/manager.c
index 6b7c682163..746da3b865 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1270,8 +1270,7 @@ static enum error_type handle_updates(struct mansession *s, const struct message
 {
 	int x;
 	char hdr[40];
-	const char *action, *cat, *match, *line, *tmp;
-	char *var, *value;
+	const char *action, *cat, *var, *value, *match, *line;
 	struct ast_category *category;
 	struct ast_variable *v;
 	struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
@@ -1287,23 +1286,10 @@ static enum error_type handle_updates(struct mansession *s, const struct message
 		snprintf(hdr, sizeof(hdr), "Cat-%06d", x);
 		cat = astman_get_header(m, hdr);
 		snprintf(hdr, sizeof(hdr), "Var-%06d", x);
-		if ((tmp = astman_get_header(m, hdr))) {
-			ast_str_make_space(&str1, strlen(tmp) + 1);
-			strcpy(str1->str, tmp);
-			var = str1->str;
-			ast_uri_decode(var);
-		} else {
-			var = "";
-		}
+		var = astman_get_header(m, hdr);
 		snprintf(hdr, sizeof(hdr), "Value-%06d", x);
-		if ((tmp = astman_get_header(m, hdr))) {
-			ast_str_make_space(&str2, strlen(tmp) + 1);
-			strcpy(str2->str, tmp);
-			value = str2->str;
-			ast_uri_decode(value);
-		} else {
-			value = "";
-		}
+		value = astman_get_header(m, hdr);
+
 		if (!ast_strlen_zero(value) && *value == '>') {
 			object = 1;
 			value++;