~ubuntu-branches/ubuntu/utopic/python-eventlet/utopic

« back to all changes in this revision

Viewing changes to debian/patches/retry-on-timeout.patch

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2011-06-08 15:13:04 UTC
  • mfrom: (4.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110608151304-ab35lybeozkz72ws
Tags: 0.9.16-1
* Team upload.
* New upstream release.
* Dropped reuseaddr.patch: Included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
Description: If an operation times out, try one last time.
2
2
 This addresses a problem where a timeout fires even though the
3
 
 connection was actually correctly established.  
4
 
Origin: Chris Behrens, https://bitbucket-assetroot.s3.amazonaws.com/which_linden/eventlet/20110513/87/eventlet-socket-timeout.patch
5
 
Bug: https://bitbucket.org/which_linden/eventlet/issue/87/socket-connects-are-incorrectly-reported 
 
3
 connection was actually correctly established.
 
4
Origin: Chris Behrens, https://bitbucket-assetroot.s3.amazonaws.com/which_linden/eventlet/20110601/87/eventlet-socket-timeout.diff
 
5
Bug: https://bitbucket.org/which_linden/eventlet/issue/87/socket-connects-are-incorrectly-reported
6
6
Bug-Ubuntu: https://launchpad.net/bugs/771512
7
7
Reviewed-By: Soren Hansen <soren@ubuntu.com>
8
 
Last-Update: 2011-05-12
9
 
 
10
 
 
11
 
Index: python-eventlet-0.9.15/eventlet/greenio.py
12
 
===================================================================
13
 
--- python-eventlet-0.9.15.orig/eventlet/greenio.py
14
 
+++ python-eventlet-0.9.15/eventlet/greenio.py
 
8
Last-Update: 2011-06-01
 
9
 
 
10
--- a/eventlet/greenio.py
 
11
+++ b/eventlet/greenio.py
15
12
@@ -174,8 +174,16 @@
16
13
                     return
17
14
                 if time.time() >= end:
171
168
 
172
169
     def setblocking(self, flag):
173
170
         if flag:
174
 
Index: python-eventlet-0.9.15/tests/greenio_test.py
175
 
===================================================================
176
 
--- python-eventlet-0.9.15.orig/tests/greenio_test.py
177
 
+++ python-eventlet-0.9.15/tests/greenio_test.py
 
171
--- a/tests/greenio_test.py
 
172
+++ b/tests/greenio_test.py
178
173
@@ -133,7 +133,8 @@
179
174
             self.assertEqual(e.args[0], 'timed out')
180
175