comparison src/http/ngx_http_header_filter_module.c @ 657:400711951595 release-0.3.50

nginx-0.3.50-RELEASE import *) Change: the "proxy_redirect_errors" and "fastcgi_redirect_errors" directives was renamed to the "proxy_intercept_errors" and "fastcgi_intercept_errors" directives. *) Feature: the ngx_http_charset_module supports the recoding from the single byte encodings to the UTF-8 encoding and back. *) Feature: the "X-Accel-Charset" response header line is supported in proxy and FastCGI mode. *) Bugfix: the "\" escape symbol in the "\"" and "\'" pairs in the SSI command was removed only if the command also has the "$" symbol. *) Bugfix: the "<!--" string might be added on some conditions in the SSI after inclusion. *) Bugfix: if the "Content-Length: 0" header line was in response, then in nonbuffered proxying mode the client connection was not closed.
author Igor Sysoev <igor@sysoev.ru>
date Wed, 28 Jun 2006 16:00:26 +0000
parents e60fe4cf1d4e
children 6d5c1535bb9d
comparison
equal deleted inserted replaced
656:97f36f8e65dd 657:400711951595
245 245
246 if (r->headers_out.content_type.len) { 246 if (r->headers_out.content_type.len) {
247 len += sizeof("Content-Type: ") - 1 247 len += sizeof("Content-Type: ") - 1
248 + r->headers_out.content_type.len + 2; 248 + r->headers_out.content_type.len + 2;
249 249
250 if (r->headers_out.charset.len) { 250 if (r->headers_out.content_type_len == r->headers_out.content_type.len
251 && r->headers_out.charset.len)
252 {
251 len += sizeof("; charset=") - 1 + r->headers_out.charset.len; 253 len += sizeof("; charset=") - 1 + r->headers_out.charset.len;
252 } 254 }
253 } 255 }
254 256
255 if (r->headers_out.content_length == NULL 257 if (r->headers_out.content_length == NULL
378 sizeof("Content-Type: ") - 1); 380 sizeof("Content-Type: ") - 1);
379 p = b->last; 381 p = b->last;
380 b->last = ngx_copy(b->last, r->headers_out.content_type.data, 382 b->last = ngx_copy(b->last, r->headers_out.content_type.data,
381 r->headers_out.content_type.len); 383 r->headers_out.content_type.len);
382 384
383 if (r->headers_out.charset.len) { 385 if (r->headers_out.content_type_len == r->headers_out.content_type.len
386 && r->headers_out.charset.len)
387 {
384 b->last = ngx_cpymem(b->last, "; charset=", 388 b->last = ngx_cpymem(b->last, "; charset=",
385 sizeof("; charset=") - 1); 389 sizeof("; charset=") - 1);
386 b->last = ngx_copy(b->last, r->headers_out.charset.data, 390 b->last = ngx_copy(b->last, r->headers_out.charset.data,
387 r->headers_out.charset.len); 391 r->headers_out.charset.len);
388 392