--- /usr/lib/python2.7/cgi.py	2014-11-03 16:27:11.000000000 +0200
+++ lib/python2.7/cgi.py	2015-02-11 09:52:44.141933758 +0200
@@ -55,6 +55,8 @@
 except ImportError:
     from StringIO import StringIO
 
+import rfc6266
+
 __all__ = ["MiniFieldStorage", "FieldStorage", "FormContentDict",
            "SvFormContentDict", "InterpFormContentDict", "FormContent",
            "parse", "parse_qs", "parse_qsl", "parse_multipart",
@@ -456,7 +458,8 @@
         # Process content-disposition header
         cdisp, pdict = "", {}
         if 'content-disposition' in self.headers:
-            cdisp, pdict = parse_header(self.headers['content-disposition'])
+            cd = rfc6266.parse_headers(self.headers['content-disposition'])
+            cdisp, pdict = cd.disposition, cd.assocs
         self.disposition = cdisp
         self.disposition_options = pdict
         self.name = None
@@ -465,6 +468,8 @@
         self.filename = None
         if 'filename' in pdict:
             self.filename = pdict['filename']
+        if 'filename*' in pdict:
+            self.filename = pdict['filename*'].string
 
         # Process content-type header
         #