3 files changed, 49 insertions, 4 deletions
diff --git a/net/ceph12/files/file-git_version b/net/ceph12/files/file-git_version
index 268e02b634ff..0db67cc6ab17 100644
--- a/net/ceph12/files/file-git_version
+++ b/net/ceph12/files/file-git_version
@@ -1,2 +1,2 @@
-26dc3775efc7bb286a1d6d66faee0ba30ea23eee
-v12.2.11
+dc24c37717be1fac98eabdcc434d16d7c0c14245
+v12.2.12-351-gdc24c37717
diff --git a/net/ceph12/files/patch-src_rgw_rgw_civetweb.cc b/net/ceph12/files/patch-src_rgw_rgw_civetweb.cc
new file mode 100644
index 000000000000..487725cc446d
--- /dev/null
+++ b/net/ceph12/files/patch-src_rgw_rgw_civetweb.cc
@@ -0,0 +1,36 @@
+*** src/rgw/rgw_civetweb.cc	Thu Apr 11 14:33:50 2019
+--- src/rgw/rgw_civetweb.cc.new	Mon Aug 19 11:31:24 2019
+***************
+*** 89,95 ****
+    }
+  
+    for (int i = 0; i < info->num_headers; i++) {
+!     const struct mg_request_info::mg_header* header = &info->http_headers[i];
+  
+      if (header->name == nullptr || header->value==nullptr) {
+        lderr(cct) << "client supplied malformatted headers" << dendl;
+--- 89,95 ----
+    }
+  
+    for (int i = 0; i < info->num_headers; i++) {
+!     const auto header = &info->http_headers[i];
+  
+      if (header->name == nullptr || header->value==nullptr) {
+        lderr(cct) << "client supplied malformatted headers" << dendl;
+***************
+*** 132,138 ****
+    env.set("REQUEST_METHOD", info->request_method);
+    env.set("HTTP_VERSION", info->http_version);
+    env.set("REQUEST_URI", info->request_uri); // get the full uri, we anyway handle abs uris later
+!   env.set("SCRIPT_URI", info->uri); /* FIXME */
+    if (info->query_string) {
+      env.set("QUERY_STRING", info->query_string);
+    }
+--- 132,138 ----
+    env.set("REQUEST_METHOD", info->request_method);
+    env.set("HTTP_VERSION", info->http_version);
+    env.set("REQUEST_URI", info->request_uri); // get the full uri, we anyway handle abs uris later
+!   env.set("SCRIPT_URI", info->local_uri); 
+    if (info->query_string) {
+      env.set("QUERY_STRING", info->query_string);
+    }
diff --git a/net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc b/net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc
index 661d055d8ca6..e98f5fb79716 100644
--- a/net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc
+++ b/net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc
@@ -1,8 +1,17 @@
 diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc
-index aa58219b5a..de4200d75e 100644
+index b5be52413b..7275823314 100644
 --- src/rgw/rgw_sync_module_es.cc
 +++ src/rgw/rgw_sync_module_es.cc
-@@ -244,7 +244,7 @@ struct es_index_config {
+@@ -108,7 +108,7 @@ public:
+ #define ES_NUM_REPLICAS_DEFAULT 1
+ 
+ using ESVersion = std::pair<int,int>;
+-static constexpr ESVersion ES_V5{5,0};
++static const ESVersion ES_V5{5,0};
+ 
+ struct ESInfo {
+   std::string name;
+@@ -402,7 +402,7 @@ struct es_index_config : public es_index_config_base {
  };
  
  static bool is_sys_attr(const std::string& attr_name){