Mercurial > hg > nginx
changeset 5497:2cfc095a607a
Fixed setting of content type in some cases.
This fixes content type set in stub_status and autoindex responses
to be usable in content type checks made by filter modules, such
as charset and sub filters.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Fri, 27 Dec 2013 19:40:04 +0400 |
parents | 9d056f10fb99 |
children | d39a69427056 |
files | src/http/modules/ngx_http_autoindex_module.c src/http/modules/ngx_http_image_filter_module.c src/http/modules/ngx_http_stub_status_module.c |
diffstat | 3 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_autoindex_module.c Fri Dec 27 18:47:42 2013 +0400 +++ b/src/http/modules/ngx_http_autoindex_module.c Fri Dec 27 19:40:04 2013 +0400 @@ -233,6 +233,7 @@ r->headers_out.status = NGX_HTTP_OK; r->headers_out.content_type_len = sizeof("text/html") - 1; ngx_str_set(&r->headers_out.content_type, "text/html"); + r->headers_out.content_type_lowcase = NULL; rc = ngx_http_send_header(r);
--- a/src/http/modules/ngx_http_image_filter_module.c Fri Dec 27 18:47:42 2013 +0400 +++ b/src/http/modules/ngx_http_image_filter_module.c Fri Dec 27 19:40:04 2013 +0400 @@ -572,6 +572,7 @@ ngx_http_clean_header(r); r->headers_out.status = NGX_HTTP_OK; + r->headers_out.content_type_len = sizeof("application/json") - 1; ngx_str_set(&r->headers_out.content_type, "application/json"); r->headers_out.content_type_lowcase = NULL;
--- a/src/http/modules/ngx_http_stub_status_module.c Fri Dec 27 18:47:42 2013 +0400 +++ b/src/http/modules/ngx_http_stub_status_module.c Fri Dec 27 19:40:04 2013 +0400 @@ -98,7 +98,9 @@ return rc; } + r->headers_out.content_type_len = sizeof("text/plain") - 1; ngx_str_set(&r->headers_out.content_type, "text/plain"); + r->headers_out.content_type_lowcase = NULL; if (r->method == NGX_HTTP_HEAD) { r->headers_out.status = NGX_HTTP_OK;