From 234ca6c61d27d1cd430a5290ff858c25afb93098 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Wed, 3 Oct 2012 14:43:36 -0400
Subject: [PATCH] Fixed #19006 - Quoted filenames in Content-Disposition
 header.

---
 docs/howto/outputting-csv.txt | 4 ++--
 docs/howto/outputting-pdf.txt | 6 +++---
 docs/ref/request-response.txt | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/howto/outputting-csv.txt b/docs/howto/outputting-csv.txt
index 1a606069b85..bcc6f3827bd 100644
--- a/docs/howto/outputting-csv.txt
+++ b/docs/howto/outputting-csv.txt
@@ -21,7 +21,7 @@ Here's an example::
     def some_view(request):
         # Create the HttpResponse object with the appropriate CSV header.
         response = HttpResponse(mimetype='text/csv')
-        response['Content-Disposition'] = 'attachment; filename=somefilename.csv'
+        response['Content-Disposition'] = 'attachment; filename="somefilename.csv"'
 
         writer = csv.writer(response)
         writer.writerow(['First row', 'Foo', 'Bar', 'Baz'])
@@ -93,7 +93,7 @@ Here's an example, which generates the same CSV file as above::
     def some_view(request):
         # Create the HttpResponse object with the appropriate CSV header.
         response = HttpResponse(mimetype='text/csv')
-        response['Content-Disposition'] = 'attachment; filename=somefilename.csv'
+        response['Content-Disposition'] = 'attachment; filename="somefilename.csv"'
 
         # The data is hard-coded here, but you could load it from a database or
         # some other source.
diff --git a/docs/howto/outputting-pdf.txt b/docs/howto/outputting-pdf.txt
index e7e4bdcfa50..9d87b977106 100644
--- a/docs/howto/outputting-pdf.txt
+++ b/docs/howto/outputting-pdf.txt
@@ -52,7 +52,7 @@ Here's a "Hello World" example::
     def some_view(request):
         # Create the HttpResponse object with the appropriate PDF headers.
         response = HttpResponse(mimetype='application/pdf')
-        response['Content-Disposition'] = 'attachment; filename=somefilename.pdf'
+        response['Content-Disposition'] = 'attachment; filename="somefilename.pdf"'
 
         # Create the PDF object, using the response object as its "file."
         p = canvas.Canvas(response)
@@ -87,7 +87,7 @@ mention:
   the PDF using whatever program/plugin they've been configured to use for
   PDFs. Here's what that code would look like::
 
-      response['Content-Disposition'] = 'filename=somefilename.pdf'
+      response['Content-Disposition'] = 'filename="somefilename.pdf"'
 
 * Hooking into the ReportLab API is easy: Just pass ``response`` as the
   first argument to ``canvas.Canvas``. The ``Canvas`` class expects a
@@ -121,7 +121,7 @@ Here's the above "Hello World" example rewritten to use :mod:`io`::
     def some_view(request):
         # Create the HttpResponse object with the appropriate PDF headers.
         response = HttpResponse(mimetype='application/pdf')
-        response['Content-Disposition'] = 'attachment; filename=somefilename.pdf'
+        response['Content-Disposition'] = 'attachment; filename="somefilename.pdf"'
 
         buffer = BytesIO()
 
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index ff929014c05..e977e32d425 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -590,7 +590,7 @@ To tell the browser to treat the response as a file attachment, use the
 this is how you might return a Microsoft Excel spreadsheet::
 
     >>> response = HttpResponse(my_data, content_type='application/vnd.ms-excel')
-    >>> response['Content-Disposition'] = 'attachment; filename=foo.xls'
+    >>> response['Content-Disposition'] = 'attachment; filename="foo.xls"'
 
 There's nothing Django-specific about the ``Content-Disposition`` header, but
 it's easy to forget the syntax, so we've included it here.