mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-05 05:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the bug that JSONP callback function name is not encoded

Browse source 
properly.
This commit is contained in:
Tatsuhiro Tsujikawa 2011-03-16 12:55:12 +09:00
parent dfdf98d2f7
commit 15730aa560
2 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/RpcResponse.cc
View file

@ -168,7 +168,7 @@ OutputStream& encodeJsonAll
int code,
const SharedHandle<ValueBase>& param,
const SharedHandle<ValueBase>& id,
const std::string& callback)
const std::string& callback = A2STR::NIL)
{
if(!callback.empty()) {
o << callback << "(";
@ -212,16 +212,22 @@ OutputStream& encodeJsonBatchAll
const std::vector<RpcResponse>& results,
const std::string& callback)
{
if(!callback.empty()) {
o << callback << "(";
}
o << "[";
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);
}
for(std::vector<RpcResponse>::const_iterator i = results.begin()+1,
eoi = results.end(); i != eoi; ++i) {
o << ",";
encodeJsonAll(o, (*i).code, (*i).param, (*i).id, callback);
encodeJsonAll(o, (*i).code, (*i).param, (*i).id);
}
o << "]";
if(!callback.empty()) {
o << ")";
}
return o;
}
} // namespace

27
test/RpcResponseTest.cc
View file

@ -36,6 +36,12 @@ void RpcResponseTest::testToJson()
"\"jsonrpc\":\"2.0\","
"\"result\":[1]}"),
s);
// with callback
s = res.toJson("cb", false);
CPPUNIT_ASSERT_EQUAL(std::string("cb({\"id\":\"9\","
"\"jsonrpc\":\"2.0\","
"\"result\":[1]})"),
s);
}
{
// error response
@ -51,6 +57,14 @@ void RpcResponseTest::testToJson()
"\"jsonrpc\":\"2.0\""
"}"),
s);
// with callback
s = res.toJson("cb", false);
CPPUNIT_ASSERT_EQUAL(std::string("cb({\"error\":{\"code\":1,"
"\"message\":\"HELLO ERROR\"},"
"\"id\":null,"
"\"jsonrpc\":\"2.0\""
"})"),
s);
}
{
// batch response
@ -66,6 +80,19 @@ void RpcResponseTest::testToJson()
"}"
"]"),
s);
// with callback
s = toJsonBatch(results, "cb", false);
CPPUNIT_ASSERT_EQUAL(std::string("cb(["
"{\"id\":\"9\","
"\"jsonrpc\":\"2.0\","
"\"result\":[1]},"
"{\"error\":{\"code\":1,"
"\"message\":\"HELLO ERROR\"},"
"\"id\":null,"
"\"jsonrpc\":\"2.0\""
"}"
"])"),
s);
}
}