From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Sun, 12 Feb 2012 05:16:50 +0000 (-0800)
Subject: Revert "rgw: don't treat plus as a space in url decode"
X-Git-Tag: v0.42~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=610da665d2a2d1a1fc7166f45dc70d3103efcd6e;p=ceph.git

Revert "rgw: don't treat plus as a space in url decode"

This reverts commit a6d7629c177fbab722a7a0c7f861caf91ff92deb.
---

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 7acdfe05ef41..cd926f41cd25 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -386,7 +386,12 @@ bool url_decode(string& src_str, string& dest_str)
 
   while (*src) {
     if (*src != '%') {
-      dest[pos++] = *src++;
+      if (*src != '+') {
+	dest[pos++] = *src++;
+      } else {
+	dest[pos++] = ' ';
+	++src;
+      }
     } else {
       src++;
       if (!*src)