rgw: fix issue with keep-alive and no content length in civetweb.

Signed-off-by: Radoslaw Zarzynski <[email protected]>
rzarzynski · Aug 23, 2015 · bd2346b · bd2346b
1 parent 6a82ad5
commit bd2346b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/civetweb b/src/civetweb
diff --git a/src/rgw/rgw_civetweb.cc b/src/rgw/rgw_civetweb.cc
@@ -24,6 +24,7 @@ int RGWMongoose::write_data(const char *buf, int len)
 RGWMongoose::RGWMongoose(mg_connection *_conn, int _port)
   : conn(_conn),
     port(_port),
+    has_content_length(false),
     explicit_keepalive(false),
     explicit_conn_close(false)
 {
@@ -124,6 +125,10 @@ int RGWMongoose::send_100_continue()
 
 int RGWMongoose::complete_header()
 {
+  if (!has_content_length) {
+    mg_enforce_close(conn);
+  }
+
   string str;
   if (explicit_keepalive) {
     str = "Connection: Keep-Alive\r\n";
@@ -138,6 +143,8 @@ int RGWMongoose::complete_header()
 
 int RGWMongoose::send_content_length(uint64_t len)
 {
+  has_content_length = true;
+
   char buf[21];
   snprintf(buf, sizeof(buf), "%" PRIu64, len);
   return print("Content-Length: %s\r\n", buf);

diff --git a/src/rgw/rgw_civetweb.h b/src/rgw/rgw_civetweb.h
@@ -17,6 +17,7 @@ class RGWMongoose : public RGWClientIO
 
   int port;
 
+  bool has_content_length;
   bool explicit_keepalive;
   bool explicit_conn_close;