From: Guido van Rossum <guido@python.org>
Date: Fri, 24 Aug 2001 13:10:13 +0000 (+0000)
Subject: SF patch #454553 by Walter Dörwald: add content-type to FTP URLs, like
X-Git-Tag: v2.2a3~346
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=833a8d86417f4832f5e3ad742f21fe10378388bb;p=thirdparty%2FPython%2Fcpython.git

SF patch #454553 by Walter Dörwald: add content-type to FTP URLs, like
for urllib.
---

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index f9e6bf254f43..5882de6c457b 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -956,11 +956,14 @@ class FTPHandler(BaseHandler):
                    value in ('a', 'A', 'i', 'I', 'd', 'D'):
                     type = value.upper()
             fp, retrlen = fw.retrfile(file, type)
+            headers = ""
+            mtype = mimetypes.guess_type(req.get_full_url())[0]
+            if mtype:
+                headers += "Content-Type: %s\n" % mtype
             if retrlen is not None and retrlen >= 0:
-                sf = StringIO('Content-Length: %d\n' % retrlen)
-                headers = mimetools.Message(sf)
-            else:
-                headers = noheaders()
+                headers += "Content-Length: %d\n" % retrlen
+            sf = StringIO(headers)
+            headers = mimetools.Message(sf)
             return addinfourl(fp, headers, req.get_full_url())
         except ftplib.all_errors, msg:
             raise IOError, ('ftp error', msg), sys.exc_info()[2]