mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 21:52:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not set charset for subrequests

Browse Source
This commit is contained in:
Igor Sysoev 2009-05-26 09:38:48 +00:00
parent 4b14a97b65
commit 77adc0d6c2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/http/modules/ngx_http_charset_filter_module.c
View File

@ -252,10 +252,7 @@ ngx_http_charset_header_filter(ngx_http_request_t *r)
"charset: \"%V\" > \"%V\"", &src, &dst); "charset: \"%V\" > \"%V\"", &src, &dst);
if (source_charset == NGX_HTTP_CHARSET_OFF) { if (source_charset == NGX_HTTP_CHARSET_OFF) {
ngx_http_set_charset(r, &dst);
if (r == r->main) {
ngx_http_set_charset(r, &dst);
}
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);
} }
@ -488,6 +485,10 @@ ngx_http_get_charset(ngx_http_request_t *r, ngx_str_t *name)
static ngx_inline void static ngx_inline void
ngx_http_set_charset(ngx_http_request_t *r, ngx_str_t *charset) ngx_http_set_charset(ngx_http_request_t *r, ngx_str_t *charset)
{ {
if (r != r->main) {
return;
}
if (r->headers_out.status == NGX_HTTP_MOVED_PERMANENTLY if (r->headers_out.status == NGX_HTTP_MOVED_PERMANENTLY
|| r->headers_out.status == NGX_HTTP_MOVED_TEMPORARILY) || r->headers_out.status == NGX_HTTP_MOVED_TEMPORARILY)
{ {