squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-20 23:47:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

- Do not use SOCKS5 proxy in downloadThread.cpp (code does not work). HTTP is ok though.

Browse Source
This commit is contained in:
Christophe Dumez
2007-11-23 20:51:03 +00:00
parent d55cd9aec8
commit 04b683c38c
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
TODO
View File

@@ -50,13 +50,10 @@
-> in download list -> in download list
-> in seeding list -> in seeding list
// TODO v1.0.0
- Fix libcommoncpp proxy support
rc8->rc9 changelog: rc8->rc9 changelog:
- FEATURE: Better media file preview (player detected automatically) - FEATURE: Better media file preview (player detected automatically)
- BUGFIX: Remember properties window size and position - 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: 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: 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 - BUGFIX: Do not save fastresume data for checking torrents anymore

25
src/downloadThread.cpp
View File

@@ -60,17 +60,20 @@ subDownloadThread::subDownloadThread(QObject *parent, QString url) : QThread(par
// Proxy enabled // Proxy enabled
QString IP = settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString(); 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()); 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)) { if(intValue==1 || intValue==3) {
// HTTP Proxy with missing leading http:// if(!IP.startsWith("http://", Qt::CaseInsensitive)) {
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()); // HTTP Proxy without leading http://
}else { 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());
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()); }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 if(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Authentication"), false).toBool()) {
url_stream->setProxyUser(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Username"), QString()).toString().toUtf8().data()); qDebug("Proxy auth required");
url_stream->setProxyPassword(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Password"), QString()).toString().toUtf8().data()); // 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
} }
} }