Mercurial > hg > nginx-vendor-current
diff src/http/ngx_http_upstream.c @ 178:87699398f955 NGINX_0_3_36
nginx 0.3.36
*) Feature: the ngx_http_addition_filter_module.
*) Feature: the "proxy_pass" and "fastcgi_pass" directives may be used
inside the "if" block.
*) Feature: the "proxy_ignore_client_abort" and
"fastcgi_ignore_client_abort" directives.
*) Feature: the "$request_completion" variable.
*) Feature: the ngx_http_perl_module supports the $r->request_method
and $r->remote_addr.
*) Feature: the ngx_http_ssi_module supports the "elif" command.
*) Bugfix: the "\/" string in the expression of the "if" command of the
ngx_http_ssi_module was treated incorrectly.
*) Bugfix: in the regular expressions in the "if" command of the
ngx_http_ssi_module.
*) Bugfix: if the relative path was specified in the
"client_body_temp_path", "proxy_temp_path", "fastcgi_temp_path", and
"perl_modules" directives, then the directory was used relatively to
a current path but not to a server prefix.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 05 Apr 2006 00:00:00 +0400 |
parents | 1b490fc19afa |
children | 54aabf2b0bc6 |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -277,9 +277,9 @@ ngx_http_upstream_init(ngx_http_request_ ngx_del_timer(c->read); } - if (!(r->http_version == NGX_HTTP_VERSION_9 && r->header_only)) { - /* not a post_action */ - + u = r->upstream; + + if (!r->post_action && !u->conf->ignore_client_abort) { r->read_event_handler = ngx_http_upstream_rd_check_broken_connection; r->write_event_handler = ngx_http_upstream_wr_check_broken_connection; } @@ -296,8 +296,6 @@ ngx_http_upstream_init(ngx_http_request_ } } - u = r->upstream; - if (r->request_body) { u->request_bufs = r->request_body->bufs; } @@ -1208,10 +1206,7 @@ ngx_http_upstream_send_response(ngx_http rc = ngx_http_send_header(r); - if (rc == NGX_ERROR - || rc > NGX_OK - /* post_action */ - || (r->http_version == NGX_HTTP_VERSION_9 && r->header_only)) { + if (rc == NGX_ERROR || rc > NGX_OK || r->post_action) { ngx_http_upstream_finalize_request(r, u, rc); return; } @@ -1947,11 +1942,7 @@ ngx_http_upstream_finalize_request(ngx_h r->connection->log->action = "sending to client"; - if (rc == 0 - && r == r->main - /* not a post_action */ - && !(r->http_version == NGX_HTTP_VERSION_9 && r->header_only)) - { + if (rc == 0 && r == r->main && !r->post_action) { rc = ngx_http_send_special(r, NGX_HTTP_LAST); }