update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rgw / rgw_civetweb_frontend.cc

diff --git a/ceph/src/rgw/rgw_civetweb_frontend.cc b/ceph/src/rgw/rgw_civetweb_frontend.cc
index 4656adb58df5c4a1671d12d18eab562115308c23..6c672db49b6b5b5840816456b28befe3d40c5dfe 100644 (file)
--- a/ceph/src/rgw/rgw_civetweb_frontend.cc
+++ b/ceph/src/rgw/rgw_civetweb_frontend.cc
@@ -3,8 +3,7 @@
 
 #include <set>
 #include <string>
-
-#include <boost/utility/string_ref.hpp>
+#include <string_view>
 
 #include "rgw_frontend.h"
 #include "rgw_client_io_filters.h"
@@ -67,10 +66,11 @@ int RGWCivetWebFrontend::process(struct mg_connection*  const conn)
 
   RGWRequest req(env.store->getRados()->get_new_req_id());
   int http_ret = 0;
+  ceph::coarse_real_clock::duration latency{};
   //assert (scheduler != nullptr);
   int ret = process_request(env.store, env.rest, &req, env.uri_prefix,
                             *env.auth_registry, &client_io, env.olog,
-                            null_yield, scheduler.get() ,&http_ret);
+                            null_yield, scheduler.get(), nullptr, &latency, &http_ret);
   if (ret < 0) {
     /* We don't really care about return code. */
     dout(20) << "process_request() returned " << ret << dendl;
@@ -96,6 +96,7 @@ int RGWCivetWebFrontend::run()
   set_conf_default(conf_map, "canonicalize_url_path", "no");
   set_conf_default(conf_map, "enable_auth_domain_check", "no");
   set_conf_default(conf_map, "allow_unicode_in_urls", "yes");
+  set_conf_default(conf_map, "request_timeout_ms", "65000");
 
   std::string listening_ports;
   // support multiple port= entries
@@ -122,7 +123,7 @@ int RGWCivetWebFrontend::run()
   }
 
   /* Prepare options for CivetWeb. */
-  const std::set<boost::string_ref> rgw_opts = { "port", "prefix" };
+  const std::set<std::string_view> rgw_opts = { "port", "prefix" };
 
   std::vector<const char*> options;