From b46e7a953b3123aa44ab265eee17378574f8d76e Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 14 Mar 2011 00:53:16 +0900 Subject: [PATCH] encodeJsonAll: Fixed stream error when gzip=true. --- src/XmlRpcResponse.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/XmlRpcResponse.cc b/src/XmlRpcResponse.cc index 22cb006f..57404f5b 100644 --- a/src/XmlRpcResponse.cc +++ b/src/XmlRpcResponse.cc @@ -171,7 +171,7 @@ OutputStream& encodeJsonAll const std::string& callback) { if(!callback.empty()) { - o << callback << '('; + o << callback << "("; } SharedHandle dict = Dict::g(); dict->put("jsonrpc", "2.0"); @@ -184,9 +184,9 @@ OutputStream& encodeJsonAll } else { dict->put("error", param); } - json::encode(o, dict).str(); + json::encode(o, dict); if(!callback.empty()) { - o << ')'; + o << ")"; } return o; } @@ -215,16 +215,16 @@ OutputStream& encodeJsonBatchAll const std::vector& results, const std::string& callback) { - o << '['; + o << "["; if(!results.empty()) { encodeJsonAll(o, results[0].code, results[0].param, results[0].id,callback); } for(std::vector::const_iterator i = results.begin()+1, eoi = results.end(); i != eoi; ++i) { - o << ','; + o << ","; encodeJsonAll(o, (*i).code, (*i).param, (*i).id, callback); } - o << ']'; + o << "]"; return o; } } // namespace