Merge pull request #5228: RGW does not send Date HTTP header when civ…

…etweb frontend is used Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Jul 19, 2015 · 0c04565 · 0c04565
2 parents 0b0d984 + e39dce7
commit 0c04565
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/rgw/rgw_civetweb.cc b/src/rgw/rgw_civetweb.cc
@@ -152,6 +152,20 @@ int RGWMongoose::send_100_continue()
   return mg_write(conn, buf, sizeof(buf) - 1);
 }
 
+static void dump_date_header(bufferlist &out)
+{
+  char timestr[TIME_BUF_SIZE];
+  const time_t gtime = time(NULL);
+  struct tm result;
+  struct tm const * const tmp = gmtime_r(&gtime, &result);
+
+  if (tmp == NULL)
+    return;
+
+  if (strftime(timestr, sizeof(timestr), "Date: %a, %d %b %Y %H:%M:%S %Z\r\n", tmp))
+    out.append(timestr);
+}
+
 int RGWMongoose::complete_header()
 {
   header_done = true;
@@ -160,6 +174,8 @@ int RGWMongoose::complete_header()
     return 0;
   }
 
+  dump_date_header(header_data);
+
   if (explicit_keepalive)
     header_data.append("Connection: Keep-Alive\r\n");
 

diff --git a/src/rgw/rgw_civetweb.h b/src/rgw/rgw_civetweb.h
@@ -3,6 +3,7 @@
 
 #ifndef CEPH_RGW_MONGOOSE_H
 #define CEPH_RGW_MONGOOSE_H
+#define TIME_BUF_SIZE 128
 
 #include "rgw_client_io.h"