From: Charles-François Natali <neologix@free.fr>
Date: Sun, 18 Dec 2011 15:05:07 +0000 (+0100)
Subject: Issue #8035: urllib: Fix a bug where the client could remain stuck after a
X-Git-Tag: v3.2.3rc1~273
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf53ae2171d01eed0e1c902b51da27b5bdfbc143;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index ca17da5b00fd..b41dd7eaa82f 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -1732,7 +1732,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 HTTPError(url, errcode, errmsg, headers, None)
 
@@ -1923,7 +1922,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:
diff --git a/Misc/NEWS b/Misc/NEWS
index 94af4462b9bc..72b33b99f3bd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -97,6 +97,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #8035: urllib: Fix a bug where the client could remain stuck after a
+  redirection or an error.
+
 - Issue #10350: Read and save errno before calling a function which might
   overwrite it.  Original patch by Hallvard B Furuseth.