From: Dan Hemberger <846186+hemberger@users.noreply.github.com>
Date: Sun, 23 Apr 2023 04:41:23 +0000 (-0700)
Subject: gh-81403: Fix for CacheFTPHandler in urllib (#13951)
X-Git-Tag: v3.12.0b1~480
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e38bebb9ee805df6848f42845e71c8da8a821ad3;p=thirdparty%2FPython%2Fcpython.git

gh-81403: Fix for CacheFTPHandler in urllib (#13951)

bpo-37222: Fix for CacheFTPHandler in urllib

A call to FTP.ntransfercmd must be followed by FTP.voidresp to clear
the "end transfer" message. Without this, the client and server get
out of sync, which will result in an error if the FTP instance is
reused to open a second URL. This scenario occurs for even the most
basic usage of CacheFTPHandler.

Reverts the patch merged as a resolution to bpo-16270 and adds a test
case for the CacheFTPHandler in test_urllib2net.py.

Co-authored-by: Senthil Kumaran <senthil@python.org>
---

diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 5da41c37bbfb..d8d882b2d335 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -134,7 +134,9 @@ class OtherNetworkTests(unittest.TestCase):
     # They do sometimes catch some major disasters, though.
 
     def test_ftp(self):
+        # Testing the same URL twice exercises the caching in CacheFTPHandler
         urls = [
+            'ftp://www.pythontest.net/README',
             'ftp://www.pythontest.net/README',
             ('ftp://www.pythontest.net/non-existent-file',
              None, urllib.error.URLError),
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 19e2e5bd3356..5314b3f26021 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -2475,7 +2475,13 @@ class ftpwrapper:
         return (ftpobj, retrlen)
 
     def endtransfer(self):
+        if not self.busy:
+            return
         self.busy = 0
+        try:
+            self.ftp.voidresp()
+        except ftperrors():
+            pass
 
     def close(self):
         self.keepalive = False