summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2012-08-20 18:05:56 (GMT)
committerPetri Lehtinen <petri@digip.org>2012-08-20 18:28:58 (GMT)
commitc6fdafcdf39ce01f7b3fa3eeb8bf297a2905d3b3 (patch)
tree7119b479d710bd3deef4c07aa77e3cb70e913027
parentf6bd1b0e0d290b1539e544fda0ab07564c9118a4 (diff)
downloadcpython-c6fdafcdf39ce01f7b3fa3eeb8bf297a2905d3b3.zip
cpython-c6fdafcdf39ce01f7b3fa3eeb8bf297a2905d3b3.tar.gz
cpython-c6fdafcdf39ce01f7b3fa3eeb8bf297a2905d3b3.tar.bz2
#15199: Fix JavaScript's default MIME type to application/javascript
-rw-r--r--Lib/mimetypes.py2
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
3 files changed, 5 insertions, 1 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index 4b1e2f9..8ce02f9 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 0d851df..30505cd 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 74c168f..a8b560e 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)