]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #19848 from cbodley/wip-luminous-boost-166
authorSage Weil <sage@newdream.net>
Mon, 29 Jan 2018 16:22:14 +0000 (10:22 -0600)
committerGitHub <noreply@github.com>
Mon, 29 Jan 2018 16:22:14 +0000 (10:22 -0600)
luminous: backport beast frontend and boost 1.66 update

1  2 
ceph.spec.in
src/rgw/rgw_asio_client.cc
src/rgw/rgw_civetweb.cc
src/rgw/rgw_common.h

diff --cc ceph.spec.in
Simple merge
Simple merge
index 110a891ca9229925064e587a9cd9aaf2c67a000e,6b7118349543efe1f92ebb58c0c51c79936e331c..f4d17d721c18d5308504f21540d16727dbe93891
@@@ -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) {
Simple merge