Rev 5602: Treate WSAECONNABORTED the same as WSAECONNRESET in the http _urllib2 code. Bug #686587 in http://bazaar.launchpad.net/~jameinel/bzr/2.3-connection-reset-581311

John Arbash Meinel john at arbash-meinel.com
Wed Jan 12 21:22:26 UTC 2011


At http://bazaar.launchpad.net/~jameinel/bzr/2.3-connection-reset-581311

------------------------------------------------------------
revno: 5602
revision-id: john at arbash-meinel.com-20110112212220-7bj6w1sa6xq4z51w
parent: john at arbash-meinel.com-20110112210954-ks0rm99vi2t29t60
fixes bug(s): https://launchpad.net/bugs/686587
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.3-connection-reset-581311
timestamp: Wed 2011-01-12 15:22:20 -0600
message:
  Treate WSAECONNABORTED the same as WSAECONNRESET in the http _urllib2 code. Bug #686587
-------------- next part --------------
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py	2011-01-10 22:20:12 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py	2011-01-12 21:22:20 +0000
@@ -598,7 +598,9 @@
                         'Bad status line received',
                         orig_error=exc_val)
                 elif (isinstance(exc_val, socket.error) and len(exc_val.args)
-                      and exc_val.args[0] in (errno.ECONNRESET, 10054)):
+                      and exc_val.args[0] in (errno.ECONNRESET, 10053, 10054)):
+                      # 10053 == WSAECONNABORTED
+                      # 10054 == WSAECONNRESET
                     raise errors.ConnectionReset(
                         "Connection lost while sending request.")
                 else:



More information about the bazaar-commits mailing list