diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-07-25 13:41:38 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-07-25 13:41:38 +0400 |
commit | 90c081478175a94a995f8b4341c968c0395161b1 (patch) | |
tree | 6fef5fa6d488ed1ba47f0581876d56bf9c16db42 /src/http/ngx_http_upstream.c | |
parent | 9e7984ca78d0a8c39155dd24c8fe0f9a3765a51d (diff) |
nginx-0.1.40-RELEASE importrelease-0.1.40
*) Bugfix: if a client sent too long header line, then the request
information did not logged in the error log.
*) Bugfix: the "Set-Cookie" header line was not transferred when the
"X-Accel-Redirect" was used; the bug had appeared in 0.1.39.
*) Bugfix: the "Content-Disposition" header line was not transferred
when the "X-Accel-Redirect" was used.
*) Bugfix: the master process did not close the listen socket on the
SIGQUIT signal.
*) Bugfix: after on-line upgrade on Linux and Solaris the process name
became shorter in the "ps" command.
Diffstat (limited to 'src/http/ngx_http_upstream.c')
-rw-r--r-- | src/http/ngx_http_upstream.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 4b877a3fb..f59ff179e 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -118,7 +118,11 @@ ngx_http_upstream_header_t ngx_http_upstream_headers_in[] = { { ngx_string("Set-Cookie"), ngx_http_upstream_ignore_header_line, 0, - ngx_http_upstream_copy_header_line, 0, 0 }, + ngx_http_upstream_copy_header_line, 0, 1 }, + + { ngx_string("Content-Disposition"), + ngx_http_upstream_ignore_header_line, 0, + ngx_http_upstream_copy_header_line, 0, 1 }, { ngx_string("Cache-Control"), ngx_http_upstream_process_multi_header_lines, @@ -221,14 +225,13 @@ ngx_http_upstream_init(ngx_http_request_t *r) } r->read_event_handler = ngx_http_upstream_rd_check_broken_connection; + r->write_event_handler = ngx_http_upstream_wr_check_broken_connection; if (ngx_event_flags & NGX_USE_CLEAR_EVENT) { - - r->write_event_handler = ngx_http_upstream_wr_check_broken_connection; if (!c->write->active) { - if (ngx_add_event(c->write, NGX_WRITE_EVENT, - NGX_CLEAR_EVENT) == NGX_ERROR) + if (ngx_add_event(c->write, NGX_WRITE_EVENT, NGX_CLEAR_EVENT) + == NGX_ERROR) { ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); return; |