summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--conf/mime.types2
-rw-r--r--src/http/modules/ngx_http_charset_filter_module.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/mime.types b/conf/mime.types
index 8a218b22a..2a4bd7382 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -5,7 +5,7 @@ types {
text/xml xml;
image/gif gif;
image/jpeg jpeg jpg;
- application/x-javascript js;
+ application/javascript js;
application/atom+xml atom;
application/rss+xml rss;
diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c
index 27a00d09a..c9b7e9e89 100644
--- a/src/http/modules/ngx_http_charset_filter_module.c
+++ b/src/http/modules/ngx_http_charset_filter_module.c
@@ -128,7 +128,7 @@ ngx_str_t ngx_http_charset_default_types[] = {
ngx_string("text/xml"),
ngx_string("text/plain"),
ngx_string("text/vnd.wap.wml"),
- ngx_string("application/x-javascript"),
+ ngx_string("application/javascript"),
ngx_string("application/rss+xml"),
ngx_null_string
};