← Back to branch summary

~ubuntu-branches/ubuntu/trusty/bittornado/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/05_bttrack_connerr_fix.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Cameron Dale
  • Date: 2006-10-27 15:46:48 UTC
  • Revision ID: james.westby@ubuntu.com-20061027154648-1ylnpnjdl401otda
http://bugs.debian.org/395326
http://bugs.debian.org/385721
http://bugs.debian.org/305388
* New upstream release (Closes: #395326)
  . Fixes BitTorrent engine error (Closes: #385721)
  . Fixes problem with super-seeding
* Fix the ipv6 in SocketHandler.py (Closes: #305388)
  (thanks to Tobias Diedrich for this fix)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_bttrack_connerr_fix.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 05_bttrack_connerr_fix.dpatch by Micah Anderson <micah@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Connections to bttrack fail (log shows AttributeError stack trace)
 
6
## DP: http://forums.degreez.net/viewtopic.php?t=3848
 
7
## DP: Bug#294803
 
8
 
 
9
@DPATCH@
 
10
diff -urNad trunk~/BitTornado/BT1/track.py trunk/BitTornado/BT1/track.py
 
11
--- trunk~/BitTornado/BT1/track.py      2006-03-30 14:26:45.000000000 -0800
 
12
+++ trunk/BitTornado/BT1/track.py       2006-03-30 14:33:37.000000000 -0800
 
13
@@ -183,7 +183,7 @@
 
14
 
 
15
 def get_forwarded_ip(headers):
 
16
     x = _get_forwarded_ip(headers)
 
17
-    if not is_valid_ip(x) or local_IPs.includes(x):
 
18
+    if x is None or not is_valid_ip(x) or local_IPs.includes(x):
 
19
         return None
 
20
     return x
 
21