mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-03 04:29:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge r3004, r3005, r3006:

Browse Source 
various header fixes:

*) allow to proxy_pass_header/fastcgi_pass_header "X-Accel-Redirect",
   "X-Accel-Limit-Rate", "X-Accel-Buffering", and "X-Accel-Charset"
*) fix handling "Last-Modified" and "Accept-Ranges" for upstream responses
*) clear "Accept-Ranges" for SSI responses
This commit is contained in:
Igor Sysoev 2009-10-26 17:13:44 +00:00
parent 6118897e33
commit 7201f40d9f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,6 +360,7 @@ ngx_http_ssi_header_filter(ngx_http_request_t *r)
if (r == r->main) { if (r == r->main) {
ngx_http_clear_content_length(r); ngx_http_clear_content_length(r);
ngx_http_clear_last_modified(r); ngx_http_clear_last_modified(r);
ngx_http_clear_accept_ranges(r);
} }
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);

13
src/http/ngx_http_upstream.c
View File

@ -230,19 +230,19 @@ ngx_http_upstream_header_t ngx_http_upstream_headers_in[] = {
{ ngx_string("X-Accel-Redirect"), { ngx_string("X-Accel-Redirect"),
ngx_http_upstream_process_header_line, ngx_http_upstream_process_header_line,
offsetof(ngx_http_upstream_headers_in_t, x_accel_redirect), offsetof(ngx_http_upstream_headers_in_t, x_accel_redirect),
ngx_http_upstream_ignore_header_line, 0, 0 }, ngx_http_upstream_copy_header_line, 0, 0 },
{ ngx_string("X-Accel-Limit-Rate"), { ngx_string("X-Accel-Limit-Rate"),
ngx_http_upstream_process_limit_rate, 0, ngx_http_upstream_process_limit_rate, 0,
ngx_http_upstream_ignore_header_line, 0, 0 }, ngx_http_upstream_copy_header_line, 0, 0 },
{ ngx_string("X-Accel-Buffering"), { ngx_string("X-Accel-Buffering"),
ngx_http_upstream_process_buffering, 0, ngx_http_upstream_process_buffering, 0,
ngx_http_upstream_ignore_header_line, 0, 0 }, ngx_http_upstream_copy_header_line, 0, 0 },
{ ngx_string("X-Accel-Charset"), { ngx_string("X-Accel-Charset"),
ngx_http_upstream_process_charset, 0, ngx_http_upstream_process_charset, 0,
ngx_http_upstream_ignore_header_line, 0, 0 }, ngx_http_upstream_copy_header_line, 0, 0 },
#if (NGX_HTTP_GZIP) #if (NGX_HTTP_GZIP)
{ ngx_string("Content-Encoding"), { ngx_string("Content-Encoding"),
@ -3340,10 +3340,11 @@ ngx_http_upstream_copy_last_modified(ngx_http_request_t *r, ngx_table_elt_t *h,
*ho = *h; *ho = *h;
r->headers_out.last_modified = ho;
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
if (r->upstream->cacheable) { if (r->upstream->cacheable) {
r->headers_out.last_modified = ho;
r->headers_out.last_modified_time = ngx_http_parse_time(h->value.data, r->headers_out.last_modified_time = ngx_http_parse_time(h->value.data,
h->value.len); h->value.len);
} }
@ -3467,6 +3468,8 @@ ngx_http_upstream_copy_allow_ranges(ngx_http_request_t *r,
*ho = *h; *ho = *h;
r->headers_out.accept_ranges = ho;
return NGX_OK; return NGX_OK;
} }