From 6171b19f2f78e705b727085a0aa98581244450f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?w=C7=92=5Fis=E7=A5=9E=E4=BB=99?= Date: Mon, 24 Aug 2015 15:06:00 +0800 Subject: [PATCH 1/2] bugfix --- ngx_http_concat_module.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ngx_http_concat_module.c b/ngx_http_concat_module.c index 80e427c..78a862a 100644 --- a/ngx_http_concat_module.c +++ b/ngx_http_concat_module.c @@ -31,6 +31,8 @@ static char *ngx_http_concat_merge_loc_conf(ngx_conf_t *cf, void *parent, static ngx_str_t ngx_http_concat_default_types[] = { ngx_string("application/x-javascript"), + ngx_string("application/javascript"), + ngx_string("text/javascript"), ngx_string("text/css"), ngx_null_string }; From 8397b7adcf70077ba2579087147cc1bf5928539c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?w=C7=92=5Fis=E7=A5=9E=E4=BB=99?= Date: Mon, 24 Aug 2015 15:26:00 +0800 Subject: [PATCH 2/2] Tweak doc --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46e6a6b..458e999 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ It enables the concatenation in a given context. **concat_types** `MIME types` -**default:** `concat_types: text/css application/x-javascript` +**default:** `concat_types: text/css application/javascript` **context:** `http, server, location`