From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 1 Aug 2012 18:19:32 +0000 (-0700)
Subject: rgw_xml: xml_handle_data() appends data string
X-Git-Tag: v0.48.1argonaut~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a06f7783fbcc02e775fc36f30e422fe0f9e0ec2d;p=ceph.git

rgw_xml: xml_handle_data() appends data string

Fixes: #2879.
xml_handle_data() appends data to the object instead of just
replacing it. Parsed data can arrive in pieces, specifically
when data is escaped.

Backport: argonaut
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/rgw/rgw_xml.cc b/src/rgw/rgw_xml.cc
index 2cd55dc8d04..1d95abcb4b6 100644
--- a/src/rgw/rgw_xml.cc
+++ b/src/rgw/rgw_xml.cc
@@ -70,7 +70,7 @@ xml_end(const char *el)
 void XMLObj::
 xml_handle_data(const char *s, int len)
 {
-  data = string(s, len);
+  data.append(s, len);
 }
 
 string& XMLObj::