From 04b683c38c8c850aaaea5c8917fffeea70fd475d Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Fri, 23 Nov 2007 20:51:03 +0000 Subject: [PATCH] - Do not use SOCKS5 proxy in downloadThread.cpp (code does not work). HTTP is ok though. --- TODO | 5 +---- src/downloadThread.cpp | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/TODO b/TODO index a1de1a426..f3ea47d1c 100644 --- a/TODO +++ b/TODO @@ -50,13 +50,10 @@ -> in download list -> in seeding list -// TODO v1.0.0 -- Fix libcommoncpp proxy support - rc8->rc9 changelog: - FEATURE: Better media file preview (player detected automatically) - BUGFIX: Remember properties window size and position -- BUGFIX: Added proxy support in search engine, RSS, downloads from urls +- BUGFIX: Added HTTP proxy support in search engine, RSS, downloads from urls - BUGFIX: Do no pause torrents before saving fastresume data anymore (no longer needed) - BUGFIX: Save fast resume data regularly (every 60 seconds) to avoid downloading from scratch if qBittorrent crashes - BUGFIX: Do not save fastresume data for checking torrents anymore diff --git a/src/downloadThread.cpp b/src/downloadThread.cpp index 4680e5861..995506bd1 100644 --- a/src/downloadThread.cpp +++ b/src/downloadThread.cpp @@ -60,17 +60,20 @@ subDownloadThread::subDownloadThread(QObject *parent, QString url) : QThread(par // Proxy enabled QString IP = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString(); qDebug("Set proxy, hostname: %s, port: %d", IP.toUtf8().data(), settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toInt()); - if((intValue==1 || intValue==3) && !IP.startsWith("http://", Qt::CaseInsensitive)) { - // HTTP Proxy with missing leading http:// - url_stream->setProxy((QString("http://")+settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString()).toUtf8().data(), settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toInt()); - }else { - url_stream->setProxy(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString().toUtf8().data(), settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toInt()); - } - if(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Authentication"), false).toBool()) { - // Authentication required - url_stream->setProxyUser(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Username"), QString()).toString().toUtf8().data()); - url_stream->setProxyPassword(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Password"), QString()).toString().toUtf8().data()); - } + if(intValue==1 || intValue==3) { + if(!IP.startsWith("http://", Qt::CaseInsensitive)) { + // HTTP Proxy without leading http:// + url_stream->setProxy((QString("http://")+settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString()).toUtf8().data(), settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toInt()); + }else { + url_stream->setProxy(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString().toUtf8().data(), settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toInt()); + } + if(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Authentication"), false).toBool()) { + qDebug("Proxy auth required"); + // Authentication required + url_stream->setProxyUser(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Username"), QString()).toString().toUtf8().data()); + url_stream->setProxyPassword(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Password"), QString()).toString().toUtf8().data()); + } + } //TODO: Support SOCKS5 proxies } }