Mercurial > hg > nginx
comparison src/event/ngx_event_pipe.c @ 509:9b8c906f6e63 release-0.1.29
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 12 May 2005 14:58:06 +0000 |
parents | cd3117ad9aab |
children | 6f00349b98e5 |
comparison
equal
deleted
inserted
replaced
508:ca1020ce99ba | 509:9b8c906f6e63 |
---|---|
62 if (rev->active) { | 62 if (rev->active) { |
63 ngx_add_timer(rev, p->read_timeout); | 63 ngx_add_timer(rev, p->read_timeout); |
64 } | 64 } |
65 } | 65 } |
66 | 66 |
67 if (p->downstream->fd != -1) { | 67 if (p->downstream->fd != -1 && p->downstream->data == p->output_ctx) { |
68 wev = p->downstream->write; | 68 wev = p->downstream->write; |
69 if (ngx_handle_write_event(wev, p->send_lowat) == NGX_ERROR) { | 69 if (ngx_handle_write_event(wev, p->send_lowat) == NGX_ERROR) { |
70 return NGX_ABORT; | 70 return NGX_ABORT; |
71 } | 71 } |
72 | 72 |
73 if (wev->active) { | 73 if (wev->active && !wev->ready && !wev->delayed) { |
74 ngx_add_timer(wev, p->send_timeout); | 74 ngx_add_timer(wev, p->send_timeout); |
75 } | 75 } |
76 } | 76 } |
77 | 77 |
78 return NGX_OK; | 78 return NGX_OK; |
178 } | 178 } |
179 | 179 |
180 chain->buf = b; | 180 chain->buf = b; |
181 chain->next = NULL; | 181 chain->next = NULL; |
182 | 182 |
183 } else if (!p->cachable && p->downstream->write->ready) { | 183 } else if (!p->cachable |
184 | 184 && p->downstream->data == p->output_ctx |
185 && p->downstream->write->ready) | |
186 { | |
185 /* | 187 /* |
186 * if the bufs are not needed to be saved in a cache and | 188 * if the bufs are not needed to be saved in a cache and |
187 * a downstream is ready then write the bufs to a downstream | 189 * a downstream is ready then write the bufs to a downstream |
188 */ | 190 */ |
189 | 191 |
407 | 409 |
408 if (p->upstream_eof || p->upstream_error || p->upstream_done) { | 410 if (p->upstream_eof || p->upstream_error || p->upstream_done) { |
409 | 411 |
410 /* pass the p->out and p->in chains to the output filter */ | 412 /* pass the p->out and p->in chains to the output filter */ |
411 | 413 |
414 for (cl = p->busy; cl; cl = cl->next) { | |
415 cl->buf->recycled = 0; | |
416 } | |
417 | |
412 if (p->out) { | 418 if (p->out) { |
413 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0, | 419 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0, |
414 "pipe write downstream flush out"); | 420 "pipe write downstream flush out"); |
415 | 421 |
422 for (cl = p->out; cl; cl = cl->next) { | |
423 cl->buf->recycled = 0; | |
424 } | |
425 | |
416 if (p->output_filter(p->output_ctx, p->out) == NGX_ERROR) { | 426 if (p->output_filter(p->output_ctx, p->out) == NGX_ERROR) { |
417 p->downstream_error = 1; | 427 p->downstream_error = 1; |
418 return ngx_event_pipe_drain_chains(p); | 428 return ngx_event_pipe_drain_chains(p); |
419 } | 429 } |
420 | 430 |
423 | 433 |
424 if (p->in) { | 434 if (p->in) { |
425 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0, | 435 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0, |
426 "pipe write downstream flush in"); | 436 "pipe write downstream flush in"); |
427 | 437 |
438 for (cl = p->in; cl; cl = cl->next) { | |
439 cl->buf->recycled = 0; | |
440 } | |
441 | |
428 if (p->output_filter(p->output_ctx, p->in) == NGX_ERROR) { | 442 if (p->output_filter(p->output_ctx, p->in) == NGX_ERROR) { |
429 p->downstream_error = 1; | 443 p->downstream_error = 1; |
430 return ngx_event_pipe_drain_chains(p); | 444 return ngx_event_pipe_drain_chains(p); |
431 } | 445 } |
432 | 446 |
440 | 454 |
441 p->downstream_done = 1; | 455 p->downstream_done = 1; |
442 break; | 456 break; |
443 } | 457 } |
444 | 458 |
445 if (!p->downstream->write->ready) { | 459 if (p->downstream->data != p->output_ctx |
460 || !p->downstream->write->ready) | |
461 { | |
446 break; | 462 break; |
447 } | 463 } |
448 | 464 |
449 /* bsize is the size of the busy recycled bufs */ | 465 /* bsize is the size of the busy recycled bufs */ |
450 | 466 |