Plus sign must not be decoded in URI

This is different from HTTP forms.

diff --git a/src/test/url.c b/src/test/url.c
index 39b101d25248258d8f1a31bf4ecad9c70cdcb04e..4dcb0d40cc25eed611981706493259925d09e5c2 100644 (file)
--- a/src/test/url.c
+++ b/src/test/url.c
@@ -95,9 +95,6 @@ int main (void)
     test_decode ("this_should_not_be_modified_1234",
                  "this_should_not_be_modified_1234");
 
-    test_decode ("This+should+be+modified+1234!",
-                 "This should be modified 1234!");
-
     test_decode ("This%20should%20be%20modified%201234!",
                  "This should be modified 1234!");
 
@@ -109,7 +106,7 @@ int main (void)
     test_decode ("%0000", "");
 
     /* Non-ASCII tests */
-    test_decode ("T%C3%a9l%c3%A9vision+%e2%82%Ac", "Télévision €");
+    test_decode ("T%C3%a9l%c3%A9vision %e2%82%Ac", "Télévision €");
     test_decode ("T%E9l%E9vision", "T\xe9l\xe9vision");
 
     /* Base 64 tests */

diff --git a/src/text/strings.c b/src/text/strings.c
index 25886ff045ea889f3feb48ead457088efc5e91db..fa1b39cfe05eadc81c708c39f5147f58767dec57 100644 (file)
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -95,10 +95,6 @@ char *decode_URI( char *psz )
                 break;
             }
 
-            case '+': /* This is HTTP forms, not URI decoding... */
-                *out++ = ' ';
-                break;
-
             default:
                 /* Inserting non-ASCII or non-printable characters is unsafe,
                  * and no sane browser will send these unencoded */