mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-11 09:49:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed setting of content type in some cases.

Browse Source 
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.
This commit is contained in:
Ruslan Ermilov 2013-12-27 19:40:04 +04:00
parent 2b1156d101
commit 2539ce036f
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/http/modules/ngx_http_autoindex_module.c
View File

@ -233,6 +233,7 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
r->headers_out.status = NGX_HTTP_OK; r->headers_out.status = NGX_HTTP_OK;
r->headers_out.content_type_len = sizeof("text/html") - 1; r->headers_out.content_type_len = sizeof("text/html") - 1;
ngx_str_set(&r->headers_out.content_type, "text/html"); ngx_str_set(&r->headers_out.content_type, "text/html");
r->headers_out.content_type_lowcase = NULL;
rc = ngx_http_send_header(r); rc = ngx_http_send_header(r);

1
src/http/modules/ngx_http_image_filter_module.c
View File

@ -572,6 +572,7 @@ ngx_http_image_json(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
ngx_http_clean_header(r); ngx_http_clean_header(r);
r->headers_out.status = NGX_HTTP_OK; 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"); ngx_str_set(&r->headers_out.content_type, "application/json");
r->headers_out.content_type_lowcase = NULL; r->headers_out.content_type_lowcase = NULL;

2
src/http/modules/ngx_http_stub_status_module.c
View File

@ -98,7 +98,9 @@ static ngx_int_t ngx_http_status_handler(ngx_http_request_t *r)
return rc; return rc;
} }
r->headers_out.content_type_len = sizeof("text/plain") - 1;
ngx_str_set(&r->headers_out.content_type, "text/plain"); ngx_str_set(&r->headers_out.content_type, "text/plain");
r->headers_out.content_type_lowcase = NULL;
if (r->method == NGX_HTTP_HEAD) { if (r->method == NGX_HTTP_HEAD) {
r->headers_out.status = NGX_HTTP_OK; r->headers_out.status = NGX_HTTP_OK;