]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5228 from theanalyst/wip-11872-hammer
authorLoic Dachary <loic@dachary.org>
Fri, 31 Jul 2015 18:54:26 +0000 (20:54 +0200)
committerLoic Dachary <loic@dachary.org>
Fri, 31 Jul 2015 18:54:26 +0000 (20:54 +0200)
RGW does not send Date HTTP header when civetweb frontend is used

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
1  2 
src/rgw/rgw_civetweb.cc
src/rgw/rgw_civetweb.h

index 1fb28b951c543defb1b174a461d8fb1f49a68e6d,1495e92d4741f3cd057b4c3c127dbf185516924e..eea3b1459bd7f245c789d8559d42c4cc5b3a1a64
@@@ -161,10 -169,10 +175,12 @@@ int RGWMongoose::complete_header(
      return 0;
    }
  
+   dump_date_header(header_data);
    if (explicit_keepalive)
      header_data.append("Connection: Keep-Alive\r\n");
 +  else if (explicit_conn_close)
 +    header_data.append("Connection: close\r\n");
  
    header_data.append("\r\n");
  
Simple merge