oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

config/Migrate: library to migrate deprecated settings

Browse Source
This commit is contained in:
Max Kellermann
2018-07-18 09:42:56 +02:00
parent 8df98932b1
commit 49efb6071c
9 changed files with 120 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/input/plugins/CurlInputPlugin.cxx
View File

@@ -31,7 +31,6 @@
#include "../IcyInputStream.hxx"
#include "IcyMetaDataParser.hxx"
#include "../InputPlugin.hxx"
#include "config/Global.hxx"
#include "config/Block.hxx"
#include "tag/Builder.hxx"
#include "tag/Tag.hxx"
@@ -328,15 +327,6 @@ input_curl_init(EventLoop &event_loop, const ConfigBlock &block)
proxy_user = block.GetBlockValue("proxy_user");
proxy_password = block.GetBlockValue("proxy_password");
if (proxy == nullptr) {
/* deprecated proxy configuration */
proxy = config_get_string(ConfigOption::HTTP_PROXY_HOST);
proxy_port = config_get_positive(ConfigOption::HTTP_PROXY_PORT, 0);
proxy_user = config_get_string(ConfigOption::HTTP_PROXY_USER);
proxy_password = config_get_string(ConfigOption::HTTP_PROXY_PASSWORD,
"");
}
verify_peer = block.GetBlockValue("verify_peer", true);
verify_host = block.GetBlockValue("verify_host", true);
}