From: Giampaolo Rodolà <g.rodola@gmail.com>
Date: Mon, 19 Apr 2010 21:46:28 +0000 (+0000)
Subject: Fix Issue #4841: timeout is now applied for connections resulting from PORT/EPRT... 
X-Git-Tag: v2.7b2~245
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=607f7c056e19b6418421fd26b6754c906868672f;p=thirdparty%2FPython%2Fcpython.git

Fix Issue #4841: timeout is now applied for connections resulting from PORT/EPRT commands
---

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 31ac526957d2..c1cef8efcab2 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -295,6 +295,8 @@ class FTP:
             resp = self.sendport(host, port)
         else:
             resp = self.sendeprt(host, port)
+        if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
+            sock.settimeout(self.timeout)
         return sock
 
     def makepasv(self):
@@ -347,6 +349,8 @@ class FTP:
             if resp[0] != '1':
                 raise error_reply, resp
             conn, sockaddr = sock.accept()
+            if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
+                conn.settimeout(self.timeout)
         if resp[:3] == '150':
             # this is conditional in case we received a 125
             size = parse150(resp)
diff --git a/Misc/NEWS b/Misc/NEWS
index c7bf380af692..9eecb104f1f6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #4814: timeout parameter is now applied also for connections resulting
+  from PORT/EPRT commands.
+
 - Issue #8463: added missing reference to bztar in shutil's documentation.
 
 - Issue #8438: Remove reference to the missing "surrogateescape" encoding