From: Petri Lehtinen <petri@digip.org>
Date: Mon, 20 Aug 2012 18:05:56 +0000 (+0300)
Subject: #15199: Fix JavaScript's default MIME type to application/javascript
X-Git-Tag: v3.3.0rc1~56^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6fdafcdf39ce01f7b3fa3eeb8bf297a2905d3b3;p=thirdparty%2FPython%2Fcpython.git

#15199: Fix JavaScript's default MIME type to application/javascript
---

diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 4b1e2f945a97..8ce02f9200b2 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -430,7 +430,7 @@ def _default_mime_types():
         '.jpe'    : 'image/jpeg',
         '.jpeg'   : 'image/jpeg',
         '.jpg'    : 'image/jpeg',
-        '.js'     : 'application/x-javascript',
+        '.js'     : 'application/javascript',
         '.ksh'    : 'text/plain',
         '.latex'  : 'application/x-latex',
         '.m1v'    : 'video/mpeg',
diff --git a/Misc/ACKS b/Misc/ACKS
index 0d851df31344..30505cd00589 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -480,6 +480,7 @@ Jens B. Jorgensen
 Sijin Joseph
 Andreas Jung
 Tattoo Mabonzo K.
+Bohuslav Kabrda
 Bob Kahn
 Kurt B. Kaiser
 Tamito Kajiyama
diff --git a/Misc/NEWS b/Misc/NEWS
index 74c168f1c539..a8b560e8803d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -107,6 +107,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #15199: Fix JavaScript's default MIME type to application/javascript.
+  Patch by Bohuslav Kabrda.
+
 - Issue #13579: string.Formatter now understands the 'a' conversion specifier.
 
 - Issue #15595: Fix subprocess.Popen(universal_newlines=True)