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 c385c34c53d52d396ad2e7eedbf450e568a8fb99..0fafef8030a74e26dba4afd7208da5cd1541b09e 100644 (file)
--- 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);