diff options
Diffstat (limited to 'src/plugins/Transports')
| -rw-r--r-- | src/plugins/Transports/http/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/Transports/http/httpstreamreader.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/Transports/http/CMakeLists.txt b/src/plugins/Transports/http/CMakeLists.txt index 17aeda68e..8dff9b9c6 100644 --- a/src/plugins/Transports/http/CMakeLists.txt +++ b/src/plugins/Transports/http/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) # libcurl -pkg_search_module(CURL libcurl) +pkg_search_module(CURL libcurl >= 7.19.4) include_directories(${CURL_INCLUDE_DIRS}) link_directories(${CURL_LIBRARY_DIRS}) ADD_DEFINITIONS(${CURL_CFLAGS}) diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp index 25fa2729b..bca2844cb 100644 --- a/src/plugins/Transports/http/httpstreamreader.cpp +++ b/src/plugins/Transports/http/httpstreamreader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2017 by Ilya Kotov * + * Copyright (C) 2006-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -299,10 +299,9 @@ void HttpStreamReader::run() strdup((QmmpSettings::instance()->proxy().host() + ":" + QString("%1").arg(QmmpSettings::instance()->proxy().port())). toLatin1 ().constData ())); -#if LIBCURL_VERSION_NUM >= 0x071304 else curl_easy_setopt(m_handle, CURLOPT_NOPROXY, "*"); -#endif + if (QmmpSettings::instance()->useProxyAuth()) curl_easy_setopt(m_handle, CURLOPT_PROXYUSERPWD, strdup((QmmpSettings::instance()->proxy().userName() + ":" + |