Merge pull request #12861 from theanalyst/wip-absolute-urls

rgw: pass authentication domain to civetweb Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
ceph · May 22, 2017 · 34a17d5 · 34a17d5
2 parents cea91e0 + 3270405
commit 34a17d5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/civetweb b/src/civetweb
diff --git a/src/rgw/rgw_civetweb.cc b/src/rgw/rgw_civetweb.cc
@@ -111,7 +111,7 @@ void RGWCivetWeb::init_env(CephContext *cct)
   }
 
   env.set("REQUEST_METHOD", info->request_method);
-  env.set("REQUEST_URI", info->uri);
+  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);

diff --git a/src/rgw/rgw_civetweb_frontend.cc b/src/rgw/rgw_civetweb_frontend.cc
@@ -53,6 +53,7 @@ int RGWCivetWebFrontend::run()
   set_conf_default(conf_map, "enable_keep_alive", "yes");
   set_conf_default(conf_map, "validate_http_method", "no");
   set_conf_default(conf_map, "canonicalize_url_path", "no");
+  set_conf_default(conf_map, "enable_auth_domain_check", "no");
   conf->get_val("port", "80", &port_str);
   std::replace(port_str.begin(), port_str.end(), '+', ',');
   conf_map["listening_ports"] = port_str;