From: Charles-François Natali <neologix@free.fr>
Date: Sun, 18 Dec 2011 14:52:48 +0000 (+0100)
Subject: Issue #8035: urllib: Fix a bug where the client could remain stuck after a
X-Git-Tag: v2.7.3rc1~241
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3d35f0efe4bd669782e29a9ccf21570878ed319;p=python

Issue #8035: urllib: Fix a bug where the client could remain stuck after a
redirection or an error.
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 0432cccea6..7b0a81cade 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -374,7 +374,6 @@ class URLopener:
 
     def http_error_default(self, url, fp, errcode, errmsg, headers):
         """Default error handler: close the connection and raise IOError."""
-        void = fp.read()
         fp.close()
         raise IOError, ('http error', errcode, errmsg, headers)
 
@@ -640,7 +639,6 @@ class FancyURLopener(URLopener):
             newurl = headers['uri']
         else:
             return
-        void = fp.read()
         fp.close()
         # In case the server sent a relative URL, join with original:
         newurl = basejoin(self.type + ":" + url, newurl)
diff --git a/Misc/NEWS b/Misc/NEWS
index 8e7465c0a3..455399cdc2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -86,6 +86,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #8035: urllib: Fix a bug where the client could remain stuck after a
+  redirection or an error.
+
 - Issue #4625: If IDLE cannot write to its recent file or breakpoint
   files, display a message popup and continue rather than crash.
   (original patch by Roger Serwy)