From: Marcus Watts <mwatts@redhat.com>
Date: Wed, 28 Oct 2015 15:43:30 +0000 (-0400)
Subject: rgw/rest: don't print empty x-amz-request-id
X-Git-Tag: v11.1.0~699^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70a0a86a5621938294becb6b076b8bcfe34cd3b3;p=ceph.git

rgw/rest: don't print empty x-amz-request-id

I don't believe an empty string is ever a valid "x-amz-request-id" record.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
---

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index fc5b2f9c8e8..8512cc3238e 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -588,7 +588,7 @@ void dump_trans_id(req_state *s)
   if (s->prot_flags & RGW_REST_SWIFT) {
     STREAM_IO(s)->print("X-Trans-Id: %s\r\n", s->trans_id.c_str());
   }
-  else {
+  else if (s->trans_id.length()) {
     STREAM_IO(s)->print("x-amz-request-id: %s\r\n", s->trans_id.c_str());
   }
 }