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

2009-10-04 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Browse source 
Fixed the bug that the option values changed by XML-RPC
	method(changeOption and changeGlobalOption) are overwritten to the
	previous value by the next these request which doesn't contain
	that option value. Supporse max-download-limit is initially 0. You
	changed this value to 100K by changeOption. Then you issue
	changeOption request to change max-upload-limit to 50K. This
	second request doesn't contain xml-download-limit, so it is back
	to initial value, 0. Another improvement is that exception is
	thrown when changeOption and changeGlobalOption request contains
	option name which doesn't allowed in each request.
	* src/DownloadEngine.h
	* src/XmlRpcMethod.cc
	* src/XmlRpcMethod.h
	* src/XmlRpcMethodImpl.cc
	* src/download_helper.cc
	* src/download_helper.h
	* test/XmlRpcMethodTest.cc
This commit is contained in:
Tatsuhiro Tsujikawa 2009-10-04 09:01:11 +00:00
parent ce3de835b4
commit c0595d17ff
8 changed files with 142 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/XmlRpcMethodImpl.cc
View file

@ -592,15 +592,17 @@ BDE ChangeOptionXmlRpcMethod::process
throw DL_ABORT_EX
(StringFormat("Cannot change option for GID#%d", gid).str());
}
SharedHandle<Option> option(new Option(*group->getOption().get()));
SharedHandle<Option> option(new Option());
if(params.size() > 1 && params[1].isDict()) {
gatherChangeableOption(option, params[1]);
}
if(option->defined(PREF_MAX_DOWNLOAD_LIMIT)) {
group->setMaxDownloadSpeedLimit(option->getAsInt(PREF_MAX_DOWNLOAD_LIMIT));
}
if(option->defined(PREF_MAX_UPLOAD_LIMIT)) {
group->setMaxUploadSpeedLimit(option->getAsInt(PREF_MAX_UPLOAD_LIMIT));
applyChangeableOption(group->getOption().get(), option.get());
if(option->defined(PREF_MAX_DOWNLOAD_LIMIT)) {
group->setMaxDownloadSpeedLimit
(option->getAsInt(PREF_MAX_DOWNLOAD_LIMIT));
}
if(option->defined(PREF_MAX_UPLOAD_LIMIT)) {
group->setMaxUploadSpeedLimit(option->getAsInt(PREF_MAX_UPLOAD_LIMIT));
}
}
return BDE_OK;
}
@ -613,8 +615,10 @@ BDE ChangeGlobalOptionXmlRpcMethod::process
if(params.empty() || !params[0].isDict()) {
return BDE_OK;
}
SharedHandle<Option> option(new Option(*e->option));
SharedHandle<Option> option(new Option());
gatherChangeableGlobalOption(option, params[0]);
applyChangeableGlobalOption(e->option, option.get());
if(option->defined(PREF_MAX_OVERALL_DOWNLOAD_LIMIT)) {
e->_requestGroupMan->setMaxOverallDownloadSpeedLimit
(option->getAsInt(PREF_MAX_OVERALL_DOWNLOAD_LIMIT));