From: Sage Weil <sage@newdream.net>
Date: Mon, 29 Jan 2018 16:22:14 +0000 (-0600)
Subject: Merge pull request #19848 from cbodley/wip-luminous-boost-166
X-Git-Tag: v12.2.3~126
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d146d830762414934375afe257c69a25f4e533f3;p=ceph.git

Merge pull request #19848 from cbodley/wip-luminous-boost-166

luminous: backport beast frontend and boost 1.66 update
---

d146d830762414934375afe257c69a25f4e533f3
diff --cc src/rgw/rgw_civetweb.cc
index 110a891ca922,6b7118349543..f4d17d721c18
--- a/src/rgw/rgw_civetweb.cc
+++ b/src/rgw/rgw_civetweb.cc
@@@ -110,8 -110,8 +110,9 @@@ void RGWCivetWeb::init_env(CephContext 
      env.set(buf, value);
    }
  
 +  env.set("REMOTE_ADDR", info->remote_addr);
    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) {