From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 31 Jul 2014 04:32:48 +0000 (-0700)
Subject: rgw: disable civetweb url decoding
X-Git-Tag: v0.80.8~64^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a953b313f1e2f884be6ee2ce356780f4f70849dd;p=ceph.git

rgw: disable civetweb url decoding

Fixes: #8621

We want to have the raw request uri, as we do the decoding ourselves.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit ffac52b316e7022796d44ae58804d9c20b9c3df9)
---

diff --git a/src/civetweb b/src/civetweb
index 438a4d0f58f81..ed8e8d19576c4 160000
--- a/src/civetweb
+++ b/src/civetweb
@@ -1 +1 @@
-Subproject commit 438a4d0f58f8126a3e0d48860a7cd3c56a3c4659
+Subproject commit ed8e8d19576c4baac3aff643c0fd9b0c1218bb33
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 9614b0787cc19..9bf9f83c1dc2b 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -922,7 +922,8 @@ public:
     snprintf(thread_pool_buf, sizeof(thread_pool_buf), "%d", (int)g_conf->rgw_thread_pool_size);
     string port_str;
     conf->get_val("port", "80", &port_str);
-    const char *options[] = {"listening_ports", port_str.c_str(), "enable_keep_alive", "yes", "num_threads", thread_pool_buf, NULL};
+    const char *options[] = {"listening_ports", port_str.c_str(), "enable_keep_alive", "yes", "num_threads", thread_pool_buf,
+                             "decode_url", "no", NULL};
 
     struct mg_callbacks cb;
     memset((void *)&cb, 0, sizeof(cb));