]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: don't append empty ETag HTTP header. 5819/head
authorRadoslaw Zarzynski <rzarzynski@mirantis.com>
Fri, 4 Sep 2015 13:11:35 +0000 (15:11 +0200)
committerRadoslaw Zarzynski <rzarzynski@mirantis.com>
Fri, 4 Sep 2015 13:15:06 +0000 (15:15 +0200)
Fixes: #12950
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
src/rgw/rgw_rest.cc

index c69d7ecefc20ee01a28b3383beea49db0bcb917a..cb84b27c4812dde8020f0083d72b0b4ab9eaa2d0 100644 (file)
@@ -339,13 +339,19 @@ void dump_content_length(struct req_state *s, uint64_t len)
   }
 }
 
-void dump_etag(struct req_state *s, const char *etag)
+void dump_etag(struct req_state * const s, const char * const etag)
 {
+  if ('\0' == *etag) {
+    return;
+  }
+
   int r;
-  if (s->prot_flags & RGW_REST_SWIFT)
+  if (s->prot_flags & RGW_REST_SWIFT) {
     r = s->cio->print("etag: %s\r\n", etag);
-  else
+  } else {
     r = s->cio->print("ETag: \"%s\"\r\n", etag);
+  }
+
   if (r < 0) {
     ldout(s->cct, 0) << "ERROR: s->cio->print() returned err=" << r << dendl;
   }