squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-03 22:22:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Search engine can now use a SOCKS5 proxy

Browse Source 
BUGFIX: Search engine loads new proxy settings without program restart
Fix a bug in HTTP communication proxy settings
This commit is contained in:
Christophe Dumez
2010-01-08 20:15:08 +00:00
parent ae5746a636
commit 3733bc9148
35 changed files with 3284 additions and 2698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/search_engine/helpers.py
View File

@@ -22,7 +22,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#VERSION: 1.2
#VERSION: 1.3
# Author:
# Christophe DUMEZ (chris@qbittorrent.org)
@@ -31,6 +31,17 @@ import re, htmlentitydefs
import tempfile
import os
import StringIO, gzip, urllib2
import socket
import socks
import re
# SOCKS5 Proxy support
if os.environ.has_key("sock_proxy") and len(os.environ["sock_proxy"].strip()) > 0:
proxy_str = os.environ["sock_proxy"].strip()
m=re.match(r"^(?:(?P<username>[^:]+):(?P<password>[^@]+)@)?(?P<host>[^:]+):(?P<port>\w+)$", proxy_str)
if m is not None:
socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, m.group('host'), int(m.group('port')), True, m.group('username'), m.group('password'))
socket.socket = socks.socksocket
def htmlentitydecode(s):
# First convert alpha entities (such as &eacute;)