diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2005-01-06 18:33:11 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2005-01-06 18:33:11 +0000 |
| commit | dc9079bdf7c95eda8555924f30e8920f3a5a3bac (patch) | |
| tree | fb58354a3c7237a767ee1ba1381efac6eacf5412 /net | |
| parent | Unbreak by upgrading to the latest stable revision, and use the (diff) | |
o Add a missing exception handler around httplib requests
o Bump PORTREVISION
Approved by: portmgr (krion)
Obtained from: John Hoffman BitTornado Developer <theshadow@degreez.net>
Notes
Notes:
svn path=/head/; revision=125732
Diffstat (limited to 'net')
| -rw-r--r-- | net/py-bittorrent-devel/Makefile | 2 | ||||
| -rw-r--r-- | net/py-bittorrent-devel/files/patch-BitTorrent::zurllib.py | 45 |
2 files changed, 46 insertions, 1 deletions
diff --git a/net/py-bittorrent-devel/Makefile b/net/py-bittorrent-devel/Makefile index c31c2dc04295..818fbc5b1bd7 100644 --- a/net/py-bittorrent-devel/Makefile +++ b/net/py-bittorrent-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= BitTorrent PORTVERSION= 3.9.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES?= net python MASTER_SITES= http://www.bittorrent.com/ diff --git a/net/py-bittorrent-devel/files/patch-BitTorrent::zurllib.py b/net/py-bittorrent-devel/files/patch-BitTorrent::zurllib.py new file mode 100644 index 000000000000..0b6211e87d94 --- /dev/null +++ b/net/py-bittorrent-devel/files/patch-BitTorrent::zurllib.py @@ -0,0 +1,45 @@ +--- BitTorrent/zurllib.py.orig Wed Jan 5 20:41:27 2005 ++++ BitTorrent/zurllib.py Wed Jan 5 20:41:50 2005 +@@ -10,7 +10,7 @@ + + # Written by John Hoffman + +-from httplib import HTTPConnection ++from httplib import HTTPConnection, HTTPException + from urlparse import urlparse + import socket + from gzip import GzipFile +@@ -20,6 +20,15 @@ + + MAX_REDIRECTS = 10 + ++class btHTTPcon(HTTPConnection): # attempt to add automatic connection timeout ++ def connect(self): ++ HTTPConnection.connect(self) ++ try: ++ self.sock.settimeout(30) ++ except: ++ pass ++ ++ + class urlopen: + def __init__(self, url): + self.tries = 0 +@@ -39,11 +48,14 @@ + if query: + url += '?'+query + # if fragment: +- self.connection = HTTPConnection(netloc) +- self.connection.request('GET', url, None, ++ try: ++ self.connection = btHTTPcon(netloc) ++ self.connection.request('GET', url, None, + { 'User-Agent': 'BitTorrent/' + version, + 'Accept-Encoding': 'gzip' } ) +- self.response = self.connection.getresponse() ++ self.response = self.connection.getresponse() ++ except HTTPException, e: ++ raise IOError, ('http error', str(e)) + status = self.response.status + if status in (301,302): + try: |