From: Ben Darnell <ben@bendarnell.com>
Date: Thu, 19 May 2011 06:35:35 +0000 (-0700)
Subject: Use the standard mime type application/json when producing json output
X-Git-Tag: v2.0.0~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5fd90fec4b07f9938150e7090e593238cb70ad2;p=thirdparty%2Ftornado.git

Use the standard mime type application/json when producing json output
---

diff --git a/tornado/web.py b/tornado/web.py
index 6d168897f..ec90634d2 100644
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -411,7 +411,9 @@ class RequestHandler(object):
         To write the output to the network, use the flush() method below.
 
         If the given chunk is a dictionary, we write it as JSON and set
-        the Content-Type of the response to be text/javascript.
+        the Content-Type of the response to be application/json.
+        (if you want to send JSON as a different Content-Type, call
+        set_header *after* calling write()).
 
         Note that lists are not converted to JSON because of a potential
         cross-site security vulnerability.  All JSON output should be
@@ -421,7 +423,7 @@ class RequestHandler(object):
         assert not self._finished
         if isinstance(chunk, dict):
             chunk = escape.json_encode(chunk)
-            self.set_header("Content-Type", "text/javascript; charset=UTF-8")
+            self.set_header("Content-Type", "application/json; charset=UTF-8")
         chunk = utf8(chunk)
         self._write_buffer.append(chunk)