github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

encodeJsonAll: Fixed stream error when gzip=true.

pull/1/head
Tatsuhiro Tsujikawa 2011-03-14 00:53:16 +09:00
parent 8a9fa9a692
commit b46e7a953b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/XmlRpcResponse.cc
View File

@ -171,7 +171,7 @@ OutputStream& encodeJsonAll
const std::string& callback) const std::string& callback)
{ {
if(!callback.empty()) { if(!callback.empty()) {
o << callback << '('; o << callback << "(";
} }
SharedHandle<Dict> dict = Dict::g(); SharedHandle<Dict> dict = Dict::g();
dict->put("jsonrpc", "2.0"); dict->put("jsonrpc", "2.0");
@ -184,9 +184,9 @@ OutputStream& encodeJsonAll
} else { } else {
dict->put("error", param); dict->put("error", param);
} }
json::encode(o, dict).str(); json::encode(o, dict);
if(!callback.empty()) { if(!callback.empty()) {
o << ')'; o << ")";
} }
return o; return o;
} }
@ -215,16 +215,16 @@ OutputStream& encodeJsonBatchAll
const std::vector<XmlRpcResponse>& results, const std::vector<XmlRpcResponse>& results,
const std::string& callback) const std::string& callback)
{ {
o << '['; o << "[";
if(!results.empty()) { if(!results.empty()) {
encodeJsonAll(o, results[0].code, results[0].param, results[0].id,callback); encodeJsonAll(o, results[0].code, results[0].param, results[0].id,callback);
} }
for(std::vector<XmlRpcResponse>::const_iterator i = results.begin()+1, for(std::vector<XmlRpcResponse>::const_iterator i = results.begin()+1,
eoi = results.end(); i != eoi; ++i) { eoi = results.end(); i != eoi; ++i) {
o << ','; o << ",";
encodeJsonAll(o, (*i).code, (*i).param, (*i).id, callback); encodeJsonAll(o, (*i).code, (*i).param, (*i).id, callback);
} }
o << ']'; o << "]";
return o; return o;
} }
} // namespace } // namespace