Skip to content

Commit

Permalink
rgw: generate the "Date" HTTP header for civetweb.
Browse files Browse the repository at this point in the history
Fixes: #10873
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit ea384f8)
  • Loading branch information
rzarzynski authored and theanalyst committed Jul 14, 2015
1 parent 9a79e8e commit e39dce7
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/rgw/rgw_civetweb.cc
Expand Up @@ -147,6 +147,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;
Expand All @@ -155,6 +169,8 @@ int RGWMongoose::complete_header()
return 0;
}

dump_date_header(header_data);

if (explicit_keepalive)
header_data.append("Connection: Keep-Alive\r\n");

Expand Down
1 change: 1 addition & 0 deletions src/rgw/rgw_civetweb.h
Expand Up @@ -3,6 +3,7 @@

#ifndef CEPH_RGW_MONGOOSE_H
#define CEPH_RGW_MONGOOSE_H
#define TIME_BUF_SIZE 128

#include "rgw_client_io.h"

Expand Down

0 comments on commit e39dce7

Please sign in to comment.