2003-04-15 01:04:58 +08:00
|
|
|
|
2004-09-28 16:34:51 +08:00
|
|
|
/*
|
2004-09-30 00:00:49 +08:00
|
|
|
* Copyright (C) Igor Sysoev
|
2004-09-28 16:34:51 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2003-10-07 23:30:05 +08:00
|
|
|
#include <ngx_config.h>
|
|
|
|
|
#include <ngx_core.h>
|
|
|
|
|
#include <ngx_event.h>
|
2003-10-22 00:49:56 +08:00
|
|
|
#include <ngx_event_pipe.h>
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2003-10-22 00:49:56 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
static ngx_int_t ngx_event_pipe_read_upstream(ngx_event_pipe_t *p);
|
|
|
|
|
static ngx_int_t ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p);
|
2003-10-22 00:49:56 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
static ngx_int_t ngx_event_pipe_write_chain_to_temp_file(ngx_event_pipe_t *p);
|
2004-11-21 03:52:20 +08:00
|
|
|
static ngx_inline void ngx_event_pipe_remove_shadow_links(ngx_buf_t *buf);
|
|
|
|
|
static ngx_inline void ngx_event_pipe_free_shadow_raw_buf(ngx_chain_t **free,
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_buf_t *buf);
|
|
|
|
|
static ngx_int_t ngx_event_pipe_drain_chains(ngx_event_pipe_t *p);
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_int_t ngx_event_pipe(ngx_event_pipe_t *p, int do_write)
|
2003-10-20 03:57:23 +08:00
|
|
|
{
|
2003-11-21 14:30:49 +08:00
|
|
|
u_int flags;
|
2003-10-29 16:30:44 +08:00
|
|
|
ngx_event_t *rev, *wev;
|
|
|
|
|
|
2003-10-20 03:57:23 +08:00
|
|
|
for ( ;; ) {
|
|
|
|
|
if (do_write) {
|
2005-01-25 20:27:35 +08:00
|
|
|
p->log->action = "sending to client";
|
|
|
|
|
|
2003-10-22 00:49:56 +08:00
|
|
|
if (ngx_event_pipe_write_to_downstream(p) == NGX_ABORT) {
|
2003-10-20 03:57:23 +08:00
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p->read = 0;
|
2003-10-22 15:05:29 +08:00
|
|
|
p->upstream_blocked = 0;
|
2003-10-20 03:57:23 +08:00
|
|
|
|
2005-01-25 20:27:35 +08:00
|
|
|
p->log->action = "reading upstream";
|
|
|
|
|
|
2003-10-22 00:49:56 +08:00
|
|
|
if (ngx_event_pipe_read_upstream(p) == NGX_ABORT) {
|
2003-10-20 03:57:23 +08:00
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-22 15:05:29 +08:00
|
|
|
if (!p->read && !p->upstream_blocked) {
|
2003-10-20 03:57:23 +08:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do_write = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-03 06:56:18 +08:00
|
|
|
if (p->upstream->fd != -1) {
|
|
|
|
|
rev = p->upstream->read;
|
2003-10-29 16:30:44 +08:00
|
|
|
|
2003-11-19 00:49:00 +08:00
|
|
|
flags = (rev->eof || rev->error) ? NGX_CLOSE_EVENT : 0;
|
|
|
|
|
|
|
|
|
|
if (ngx_handle_read_event(rev, flags) == NGX_ERROR) {
|
2003-11-03 06:56:18 +08:00
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
2003-10-20 03:57:23 +08:00
|
|
|
|
2003-11-03 06:56:18 +08:00
|
|
|
if (rev->active) {
|
|
|
|
|
ngx_add_timer(rev, p->read_timeout);
|
|
|
|
|
}
|
2003-10-29 16:30:44 +08:00
|
|
|
}
|
|
|
|
|
|
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.
2005-05-12 22:58:06 +08:00
|
|
|
if (p->downstream->fd != -1 && p->downstream->data == p->output_ctx) {
|
2003-11-03 06:56:18 +08:00
|
|
|
wev = p->downstream->write;
|
2004-10-11 23:07:03 +08:00
|
|
|
if (ngx_handle_write_event(wev, p->send_lowat) == NGX_ERROR) {
|
2003-11-03 06:56:18 +08:00
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
2003-10-20 03:57:23 +08:00
|
|
|
|
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.
2005-05-12 22:58:06 +08:00
|
|
|
if (wev->active && !wev->ready && !wev->delayed) {
|
2003-11-03 06:56:18 +08:00
|
|
|
ngx_add_timer(wev, p->send_timeout);
|
|
|
|
|
}
|
2003-10-29 16:30:44 +08:00
|
|
|
}
|
|
|
|
|
|
2003-10-20 03:57:23 +08:00
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-01-25 20:27:35 +08:00
|
|
|
static ngx_int_t ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
|
2003-04-15 01:04:58 +08:00
|
|
|
{
|
2004-11-11 22:07:14 +08:00
|
|
|
ssize_t n, size;
|
|
|
|
|
ngx_int_t rc;
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_buf_t *b;
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_chain_t *chain, *cl, *ln;
|
2003-04-15 23:06:52 +08:00
|
|
|
|
2003-10-21 15:47:21 +08:00
|
|
|
if (p->upstream_eof || p->upstream_error || p->upstream_done) {
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
2004-02-12 01:08:49 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
|
|
|
|
"pipe read upstream: %d", p->upstream->read->ready);
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2003-10-21 15:47:21 +08:00
|
|
|
for ( ;; ) {
|
|
|
|
|
|
|
|
|
|
if (p->upstream_eof || p->upstream_error || p->upstream_done) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (p->preread_bufs == NULL && !p->upstream->read->ready) {
|
2003-10-21 15:47:21 +08:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (p->preread_bufs) {
|
2003-10-14 00:32:29 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
/* use the pre-read bufs if they exist */
|
2003-10-14 00:32:29 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
chain = p->preread_bufs;
|
|
|
|
|
p->preread_bufs = NULL;
|
2003-04-18 01:59:35 +08:00
|
|
|
n = p->preread_size;
|
|
|
|
|
|
2004-02-12 01:08:49 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"pipe preread: %z", n);
|
2003-10-14 00:32:29 +08:00
|
|
|
|
2004-04-02 13:14:40 +08:00
|
|
|
if (n) {
|
|
|
|
|
p->read = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-18 01:59:35 +08:00
|
|
|
} else {
|
|
|
|
|
|
2003-10-14 00:32:29 +08:00
|
|
|
/*
|
|
|
|
|
* kqueue notifies about the end of file or a pending error.
|
2004-05-28 23:49:23 +08:00
|
|
|
* This test allows not to allocate a buf on these conditions
|
2003-10-14 00:32:29 +08:00
|
|
|
* and not to call ngx_recv_chain().
|
|
|
|
|
*/
|
2003-04-22 23:02:58 +08:00
|
|
|
|
2003-10-30 16:51:06 +08:00
|
|
|
if (p->upstream->read->available == 0
|
2004-07-02 23:54:34 +08:00
|
|
|
&& p->upstream->read->pending_eof)
|
2003-10-30 16:51:06 +08:00
|
|
|
{
|
|
|
|
|
p->upstream->read->ready = 0;
|
|
|
|
|
p->upstream->read->eof = 0;
|
|
|
|
|
p->upstream_eof = 1;
|
|
|
|
|
p->read = 1;
|
2003-10-28 23:45:41 +08:00
|
|
|
|
2004-11-26 00:17:31 +08:00
|
|
|
#if (NGX_HAVE_KQUEUE)
|
2003-10-28 23:45:41 +08:00
|
|
|
if (p->upstream->read->kq_errno) {
|
2003-10-30 16:51:06 +08:00
|
|
|
p->upstream->read->error = 1;
|
|
|
|
|
p->upstream_error = 1;
|
|
|
|
|
p->upstream_eof = 0;
|
|
|
|
|
|
2003-10-28 23:45:41 +08:00
|
|
|
ngx_log_error(NGX_LOG_ERR, p->log,
|
|
|
|
|
p->upstream->read->kq_errno,
|
2003-04-22 23:02:58 +08:00
|
|
|
"readv() failed");
|
|
|
|
|
}
|
2003-10-28 23:45:41 +08:00
|
|
|
#endif
|
|
|
|
|
|
2003-10-30 16:51:06 +08:00
|
|
|
break;
|
2003-04-22 23:02:58 +08:00
|
|
|
}
|
2003-04-18 01:59:35 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (p->free_raw_bufs) {
|
2003-10-14 00:32:29 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
/* use the free bufs if they exist */
|
2003-10-14 00:32:29 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
chain = p->free_raw_bufs;
|
2003-10-30 16:51:06 +08:00
|
|
|
if (p->single_buf) {
|
2004-05-28 23:49:23 +08:00
|
|
|
p->free_raw_bufs = p->free_raw_bufs->next;
|
2003-10-30 16:51:06 +08:00
|
|
|
chain->next = NULL;
|
|
|
|
|
} else {
|
2004-05-28 23:49:23 +08:00
|
|
|
p->free_raw_bufs = NULL;
|
2003-10-30 16:51:06 +08:00
|
|
|
}
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
} else if (p->allocated < p->bufs.num) {
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
/* allocate a new buf if it's still allowed */
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
b = ngx_create_temp_buf(p->pool, p->bufs.size);
|
|
|
|
|
if (b == NULL) {
|
2004-05-28 23:49:23 +08:00
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p->allocated++;
|
2003-04-21 22:55:47 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
chain = ngx_alloc_chain_link(p->pool);
|
|
|
|
|
if (chain == NULL) {
|
2005-01-25 20:27:35 +08:00
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
chain->buf = b;
|
|
|
|
|
chain->next = NULL;
|
2003-04-15 01:04:58 +08:00
|
|
|
|
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.
2005-05-12 22:58:06 +08:00
|
|
|
} else if (!p->cachable
|
|
|
|
|
&& p->downstream->data == p->output_ctx
|
2005-07-08 22:34:20 +08:00
|
|
|
&& p->downstream->write->ready
|
|
|
|
|
&& !p->downstream->write->delayed)
|
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.
2005-05-12 22:58:06 +08:00
|
|
|
{
|
2003-10-14 00:32:29 +08:00
|
|
|
/*
|
2004-05-28 23:49:23 +08:00
|
|
|
* if the bufs are not needed to be saved in a cache and
|
|
|
|
|
* a downstream is ready then write the bufs to a downstream
|
2003-10-14 00:32:29 +08:00
|
|
|
*/
|
|
|
|
|
|
2003-10-22 15:05:29 +08:00
|
|
|
p->upstream_blocked = 1;
|
|
|
|
|
|
2004-02-12 01:08:49 +08:00
|
|
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
|
|
|
|
"pipe downstream ready");
|
2003-04-18 01:59:35 +08:00
|
|
|
|
2003-04-21 22:55:47 +08:00
|
|
|
break;
|
2003-04-18 01:59:35 +08:00
|
|
|
|
2003-11-03 06:56:18 +08:00
|
|
|
} else if (p->cachable
|
|
|
|
|
|| p->temp_file->offset < p->max_temp_file_size)
|
|
|
|
|
{
|
2003-10-14 00:32:29 +08:00
|
|
|
|
|
|
|
|
/*
|
2005-01-25 20:27:35 +08:00
|
|
|
* if it is allowed, then save some bufs from r->in
|
2003-10-22 00:49:56 +08:00
|
|
|
* to a temporary file, and add them to a r->out chain
|
2003-10-14 00:32:29 +08:00
|
|
|
*/
|
|
|
|
|
|
2003-10-22 00:49:56 +08:00
|
|
|
rc = ngx_event_pipe_write_chain_to_temp_file(p);
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2004-02-12 01:08:49 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"pipe temp offset: %O", p->temp_file->offset);
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2005-06-07 23:56:31 +08:00
|
|
|
if (rc == NGX_BUSY) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-14 23:06:38 +08:00
|
|
|
if (rc == NGX_AGAIN) {
|
|
|
|
|
if (ngx_event_flags & NGX_USE_LEVEL_EVENT
|
|
|
|
|
&& p->upstream->read->active
|
|
|
|
|
&& p->upstream->read->ready)
|
|
|
|
|
{
|
|
|
|
|
if (ngx_del_event(p->upstream->read, NGX_READ_EVENT, 0)
|
|
|
|
|
== NGX_ERROR)
|
|
|
|
|
{
|
|
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-18 01:59:35 +08:00
|
|
|
if (rc != NGX_OK) {
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
chain = p->free_raw_bufs;
|
2003-10-30 16:51:06 +08:00
|
|
|
if (p->single_buf) {
|
2004-05-28 23:49:23 +08:00
|
|
|
p->free_raw_bufs = p->free_raw_bufs->next;
|
2003-10-30 16:51:06 +08:00
|
|
|
chain->next = NULL;
|
|
|
|
|
} else {
|
2004-05-28 23:49:23 +08:00
|
|
|
p->free_raw_bufs = NULL;
|
2003-10-30 16:51:06 +08:00
|
|
|
}
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2003-04-18 01:59:35 +08:00
|
|
|
} else {
|
2003-10-14 00:32:29 +08:00
|
|
|
|
2005-01-25 20:27:35 +08:00
|
|
|
/* there are no bufs to read in */
|
2003-04-21 22:55:47 +08:00
|
|
|
|
2004-02-12 01:08:49 +08:00
|
|
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
2004-06-01 14:04:46 +08:00
|
|
|
"no pipe bufs to read in");
|
2003-04-18 01:59:35 +08:00
|
|
|
|
|
|
|
|
break;
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
|
2003-04-18 01:59:35 +08:00
|
|
|
n = ngx_recv_chain(p->upstream, chain);
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2004-02-12 01:08:49 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"pipe recv chain: %z", n);
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (p->free_raw_bufs) {
|
|
|
|
|
chain->next = p->free_raw_bufs;
|
2003-10-30 16:51:06 +08:00
|
|
|
}
|
2004-05-28 23:49:23 +08:00
|
|
|
p->free_raw_bufs = chain;
|
2003-10-21 01:14:07 +08:00
|
|
|
|
2003-10-14 00:32:29 +08:00
|
|
|
if (n == NGX_ERROR) {
|
|
|
|
|
p->upstream_error = 1;
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2003-10-14 00:32:29 +08:00
|
|
|
if (n == NGX_AGAIN) {
|
2003-10-30 16:51:06 +08:00
|
|
|
if (p->single_buf) {
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_event_pipe_remove_shadow_links(chain->buf);
|
2003-10-30 16:51:06 +08:00
|
|
|
}
|
|
|
|
|
|
2003-10-14 00:32:29 +08:00
|
|
|
break;
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
|
2003-10-20 03:57:23 +08:00
|
|
|
p->read = 1;
|
|
|
|
|
|
2003-10-14 00:32:29 +08:00
|
|
|
if (n == 0) {
|
|
|
|
|
p->upstream_eof = 1;
|
|
|
|
|
break;
|
2003-04-15 23:06:52 +08:00
|
|
|
}
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
|
2003-11-06 01:03:41 +08:00
|
|
|
p->read_length += n;
|
2003-10-23 00:38:26 +08:00
|
|
|
cl = chain;
|
2003-10-21 01:14:07 +08:00
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
while (cl && n > 0) {
|
2003-10-14 23:06:38 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_event_pipe_remove_shadow_links(cl->buf);
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
size = cl->buf->end - cl->buf->last;
|
2003-10-14 23:06:38 +08:00
|
|
|
|
|
|
|
|
if (n >= size) {
|
2004-05-28 23:49:23 +08:00
|
|
|
cl->buf->last = cl->buf->end;
|
2003-10-14 23:06:38 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
/* STUB */ cl->buf->num = p->num++;
|
2003-10-22 15:05:29 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (p->input_filter(p, cl->buf) == NGX_ERROR) {
|
2003-10-14 23:06:38 +08:00
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
n -= size;
|
2005-04-08 23:18:55 +08:00
|
|
|
ln = cl;
|
2003-10-23 00:38:26 +08:00
|
|
|
cl = cl->next;
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_free_chain(p->pool, ln);
|
2003-04-15 01:04:58 +08:00
|
|
|
|
|
|
|
|
} else {
|
2004-05-28 23:49:23 +08:00
|
|
|
cl->buf->last += n;
|
2003-04-15 01:04:58 +08:00
|
|
|
n = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
p->free_raw_bufs = cl;
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
#if (NGX_DEBUG)
|
2004-04-02 13:14:40 +08:00
|
|
|
|
2004-10-11 23:07:03 +08:00
|
|
|
for (cl = p->busy; cl; cl = cl->next) {
|
2005-01-25 20:27:35 +08:00
|
|
|
ngx_log_debug8(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
|
|
|
|
"pipe buf busy s:%d t:%d f:%d "
|
|
|
|
|
"%p, pos %p, size: %z "
|
|
|
|
|
"file: %O, size: %z",
|
|
|
|
|
(cl->buf->shadow ? 1 : 0),
|
|
|
|
|
cl->buf->temporary, cl->buf->in_file,
|
2004-05-28 23:49:23 +08:00
|
|
|
cl->buf->start, cl->buf->pos,
|
2005-01-25 20:27:35 +08:00
|
|
|
cl->buf->last - cl->buf->pos,
|
|
|
|
|
cl->buf->file_pos,
|
|
|
|
|
cl->buf->file_last - cl->buf->file_pos);
|
2004-04-02 13:14:40 +08:00
|
|
|
}
|
|
|
|
|
|
2004-10-11 23:07:03 +08:00
|
|
|
for (cl = p->out; cl; cl = cl->next) {
|
2005-01-25 20:27:35 +08:00
|
|
|
ngx_log_debug8(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
|
|
|
|
"pipe buf out s:%d t:%d f:%d "
|
|
|
|
|
"%p, pos %p, size: %z "
|
|
|
|
|
"file: %O, size: %z",
|
|
|
|
|
(cl->buf->shadow ? 1 : 0),
|
|
|
|
|
cl->buf->temporary, cl->buf->in_file,
|
|
|
|
|
cl->buf->start, cl->buf->pos,
|
|
|
|
|
cl->buf->last - cl->buf->pos,
|
|
|
|
|
cl->buf->file_pos,
|
|
|
|
|
cl->buf->file_last - cl->buf->file_pos);
|
2004-10-11 23:07:03 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (cl = p->in; cl; cl = cl->next) {
|
2005-01-25 20:27:35 +08:00
|
|
|
ngx_log_debug8(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
|
|
|
|
"pipe buf in s:%d t:%d f:%d "
|
|
|
|
|
"%p, pos %p, size: %z "
|
|
|
|
|
"file: %O, size: %z",
|
|
|
|
|
(cl->buf->shadow ? 1 : 0),
|
|
|
|
|
cl->buf->temporary, cl->buf->in_file,
|
2004-05-28 23:49:23 +08:00
|
|
|
cl->buf->start, cl->buf->pos,
|
2005-01-25 20:27:35 +08:00
|
|
|
cl->buf->last - cl->buf->pos,
|
|
|
|
|
cl->buf->file_pos,
|
|
|
|
|
cl->buf->file_last - cl->buf->file_pos);
|
2004-04-02 13:14:40 +08:00
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
for (cl = p->free_raw_bufs; cl; cl = cl->next) {
|
2005-01-25 20:27:35 +08:00
|
|
|
ngx_log_debug8(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
|
|
|
|
"pipe buf free s:%d t:%d f:%d "
|
|
|
|
|
"%p, pos %p, size: %z "
|
|
|
|
|
"file: %O, size: %z",
|
|
|
|
|
(cl->buf->shadow ? 1 : 0),
|
|
|
|
|
cl->buf->temporary, cl->buf->in_file,
|
|
|
|
|
cl->buf->start, cl->buf->pos,
|
|
|
|
|
cl->buf->last - cl->buf->pos,
|
|
|
|
|
cl->buf->file_pos,
|
|
|
|
|
cl->buf->file_last - cl->buf->file_pos);
|
2004-04-02 13:14:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if ((p->upstream_eof || p->upstream_error) && p->free_raw_bufs) {
|
2004-03-19 13:25:53 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
/* STUB */ p->free_raw_bufs->buf->num = p->num++;
|
2004-03-19 13:25:53 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (p->input_filter(p, p->free_raw_bufs->buf) == NGX_ERROR) {
|
2003-10-17 04:19:16 +08:00
|
|
|
return NGX_ABORT;
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
p->free_raw_bufs = p->free_raw_bufs->next;
|
2003-10-30 16:51:06 +08:00
|
|
|
|
2003-10-31 15:10:36 +08:00
|
|
|
if (p->free_bufs) {
|
2004-05-28 23:49:23 +08:00
|
|
|
for (cl = p->free_raw_bufs; cl; cl = cl->next) {
|
2004-10-11 23:07:03 +08:00
|
|
|
if (cl->buf->shadow == NULL) {
|
|
|
|
|
ngx_pfree(p->pool, cl->buf->start);
|
|
|
|
|
}
|
2003-10-31 15:10:36 +08:00
|
|
|
}
|
2003-10-30 16:51:06 +08:00
|
|
|
}
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
|
2003-10-20 03:57:23 +08:00
|
|
|
if (p->cachable && p->in) {
|
2003-10-22 00:49:56 +08:00
|
|
|
if (ngx_event_pipe_write_chain_to_temp_file(p) == NGX_ABORT) {
|
2003-10-10 23:10:50 +08:00
|
|
|
return NGX_ABORT;
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-17 04:19:16 +08:00
|
|
|
return NGX_OK;
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-01-25 20:27:35 +08:00
|
|
|
static ngx_int_t ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
|
2003-10-14 13:26:00 +08:00
|
|
|
{
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
size_t bsize;
|
2004-04-02 13:14:40 +08:00
|
|
|
ngx_uint_t flush;
|
2005-01-25 20:27:35 +08:00
|
|
|
ngx_chain_t *out, **ll, *cl;
|
2003-10-14 13:26:00 +08:00
|
|
|
|
2004-02-12 01:08:49 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
|
|
|
|
"pipe write downstream: %d", p->downstream->write->ready);
|
2003-10-20 03:57:23 +08:00
|
|
|
|
|
|
|
|
for ( ;; ) {
|
2003-10-21 15:47:21 +08:00
|
|
|
if (p->downstream_error) {
|
2003-10-23 00:38:26 +08:00
|
|
|
return ngx_event_pipe_drain_chains(p);
|
2003-10-21 15:47:21 +08:00
|
|
|
}
|
2003-10-20 03:57:23 +08:00
|
|
|
|
2004-03-19 13:25:53 +08:00
|
|
|
if (p->upstream_eof || p->upstream_error || p->upstream_done) {
|
|
|
|
|
|
|
|
|
|
/* pass the p->out and p->in chains to the output filter */
|
|
|
|
|
|
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.
2005-05-12 22:58:06 +08:00
|
|
|
for (cl = p->busy; cl; cl = cl->next) {
|
|
|
|
|
cl->buf->recycled = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-19 13:25:53 +08:00
|
|
|
if (p->out) {
|
|
|
|
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
|
|
|
|
"pipe write downstream flush out");
|
|
|
|
|
|
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.
2005-05-12 22:58:06 +08:00
|
|
|
for (cl = p->out; cl; cl = cl->next) {
|
|
|
|
|
cl->buf->recycled = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-19 13:25:53 +08:00
|
|
|
if (p->output_filter(p->output_ctx, p->out) == NGX_ERROR) {
|
|
|
|
|
p->downstream_error = 1;
|
|
|
|
|
return ngx_event_pipe_drain_chains(p);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p->out = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (p->in) {
|
|
|
|
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
|
|
|
|
"pipe write downstream flush in");
|
|
|
|
|
|
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.
2005-05-12 22:58:06 +08:00
|
|
|
for (cl = p->in; cl; cl = cl->next) {
|
|
|
|
|
cl->buf->recycled = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-03-19 13:25:53 +08:00
|
|
|
if (p->output_filter(p->output_ctx, p->in) == NGX_ERROR) {
|
|
|
|
|
p->downstream_error = 1;
|
|
|
|
|
return ngx_event_pipe_drain_chains(p);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p->in = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
|
|
|
|
"pipe write downstream done");
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
/* TODO: free unused bufs */
|
2004-03-19 13:25:53 +08:00
|
|
|
|
2003-10-20 03:57:23 +08:00
|
|
|
p->downstream_done = 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
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.
2005-05-12 22:58:06 +08:00
|
|
|
if (p->downstream->data != p->output_ctx
|
2005-07-08 22:34:20 +08:00
|
|
|
|| !p->downstream->write->ready
|
|
|
|
|
|| p->downstream->write->delayed)
|
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.
2005-05-12 22:58:06 +08:00
|
|
|
{
|
2003-10-20 03:57:23 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2003-10-14 13:26:00 +08:00
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
/* bsize is the size of the busy recycled bufs */
|
2003-10-23 00:38:26 +08:00
|
|
|
|
|
|
|
|
bsize = 0;
|
2003-10-21 15:47:21 +08:00
|
|
|
|
2004-04-02 13:14:40 +08:00
|
|
|
for (cl = p->busy; cl; cl = cl->next) {
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
if (cl->buf->recycled) {
|
|
|
|
|
bsize += cl->buf->end - cl->buf->start;
|
|
|
|
|
}
|
2003-10-21 15:47:21 +08:00
|
|
|
}
|
2004-04-02 13:14:40 +08:00
|
|
|
|
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
"pipe write busy: %uz", bsize);
|
2003-10-21 15:47:21 +08:00
|
|
|
|
2003-10-22 00:49:56 +08:00
|
|
|
out = NULL;
|
2003-10-23 00:38:26 +08:00
|
|
|
ll = NULL;
|
2004-04-02 13:14:40 +08:00
|
|
|
flush = 0;
|
2003-10-21 15:47:21 +08:00
|
|
|
|
2003-10-22 00:49:56 +08:00
|
|
|
for ( ;; ) {
|
|
|
|
|
if (p->out) {
|
2003-10-23 00:38:26 +08:00
|
|
|
cl = p->out;
|
2003-10-14 23:06:38 +08:00
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
if (cl->buf->recycled
|
|
|
|
|
&& bsize + cl->buf->last - cl->buf->pos > p->busy_size)
|
|
|
|
|
{
|
2004-04-02 13:14:40 +08:00
|
|
|
flush = 1;
|
2004-03-23 14:01:52 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2003-10-14 23:06:38 +08:00
|
|
|
|
2003-10-22 00:49:56 +08:00
|
|
|
p->out = p->out->next;
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
|
|
|
|
|
ngx_event_pipe_free_shadow_raw_buf(&p->free_raw_bufs, cl->buf);
|
2003-10-14 13:26:00 +08:00
|
|
|
|
2003-10-22 00:49:56 +08:00
|
|
|
} else if (!p->cachable && p->in) {
|
2003-10-23 00:38:26 +08:00
|
|
|
cl = p->in;
|
2003-10-14 23:06:38 +08:00
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
if (cl->buf->recycled
|
|
|
|
|
&& bsize + cl->buf->last - cl->buf->pos > p->busy_size)
|
|
|
|
|
{
|
2004-04-02 13:14:40 +08:00
|
|
|
flush = 1;
|
2004-03-23 14:01:52 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2003-10-22 00:49:56 +08:00
|
|
|
|
|
|
|
|
p->in = p->in->next;
|
|
|
|
|
|
|
|
|
|
} else {
|
2003-10-14 23:06:38 +08:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
if (cl->buf->recycled) {
|
|
|
|
|
bsize += cl->buf->last - cl->buf->pos;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
cl->next = NULL;
|
2005-03-19 20:38:37 +08:00
|
|
|
|
|
|
|
|
if (out) {
|
|
|
|
|
*ll = cl;
|
|
|
|
|
} else {
|
|
|
|
|
out = cl;
|
|
|
|
|
}
|
|
|
|
|
ll = &cl->next;
|
2003-10-22 00:49:56 +08:00
|
|
|
}
|
2003-10-14 13:26:00 +08:00
|
|
|
|
2004-04-02 13:14:40 +08:00
|
|
|
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"pipe write: out:%p, f:%d", out, flush);
|
2003-10-22 15:05:29 +08:00
|
|
|
|
2004-04-02 13:14:40 +08:00
|
|
|
if (out == NULL && !flush) {
|
|
|
|
|
break;
|
2003-10-14 13:26:00 +08:00
|
|
|
}
|
|
|
|
|
|
2003-10-22 00:49:56 +08:00
|
|
|
if (p->output_filter(p->output_ctx, out) == NGX_ERROR) {
|
2003-10-21 01:14:07 +08:00
|
|
|
p->downstream_error = 1;
|
2004-03-19 13:25:53 +08:00
|
|
|
return ngx_event_pipe_drain_chains(p);
|
2003-10-20 03:57:23 +08:00
|
|
|
}
|
|
|
|
|
|
2003-10-22 15:05:29 +08:00
|
|
|
ngx_chain_update_chains(&p->free, &p->busy, &out, p->tag);
|
2003-10-14 23:06:38 +08:00
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
for (cl = p->free; cl; cl = cl->next) {
|
2003-10-22 15:05:29 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (cl->buf->temp_file) {
|
2003-11-06 01:03:41 +08:00
|
|
|
if (p->cachable || !p->cyclic_temp_file) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
/* reset p->temp_offset if all bufs had been sent */
|
2003-11-06 01:03:41 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (cl->buf->file_last == p->temp_file->offset) {
|
2003-11-06 01:03:41 +08:00
|
|
|
p->temp_file->offset = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
/* TODO: free buf if p->free_bufs && upstream done */
|
2003-11-10 04:03:38 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
/* add the free shadow raw buf to p->free_raw_bufs */
|
2003-10-22 15:05:29 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (cl->buf->last_shadow) {
|
2005-01-25 20:27:35 +08:00
|
|
|
if (ngx_event_pipe_add_free_buf(p, cl->buf->shadow) != NGX_OK) {
|
|
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
2003-10-14 13:26:00 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
cl->buf->last_shadow = 0;
|
2003-10-14 13:26:00 +08:00
|
|
|
}
|
2003-10-22 15:05:29 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
cl->buf->shadow = NULL;
|
2003-10-14 13:26:00 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
static ngx_int_t ngx_event_pipe_write_chain_to_temp_file(ngx_event_pipe_t *p)
|
2003-04-15 01:04:58 +08:00
|
|
|
{
|
2004-06-18 14:09:25 +08:00
|
|
|
ssize_t size, bsize;
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_buf_t *b;
|
2003-11-18 00:15:03 +08:00
|
|
|
ngx_chain_t *cl, *tl, *next, *out, **ll, **last_free, fl;
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (p->buf_to_file) {
|
|
|
|
|
fl.buf = p->buf_to_file;
|
2003-11-18 00:15:03 +08:00
|
|
|
fl.next = p->in;
|
|
|
|
|
out = &fl;
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2003-11-03 06:56:18 +08:00
|
|
|
} else {
|
2003-11-18 00:15:03 +08:00
|
|
|
out = p->in;
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
|
2003-10-17 04:19:16 +08:00
|
|
|
if (!p->cachable) {
|
2003-04-15 01:04:58 +08:00
|
|
|
|
|
|
|
|
size = 0;
|
2003-11-18 00:15:03 +08:00
|
|
|
cl = out;
|
2003-10-23 00:38:26 +08:00
|
|
|
ll = NULL;
|
2003-10-21 15:47:21 +08:00
|
|
|
|
2004-02-12 01:08:49 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"pipe offset: %O", p->temp_file->offset);
|
2003-04-15 01:04:58 +08:00
|
|
|
|
|
|
|
|
do {
|
2004-05-28 23:49:23 +08:00
|
|
|
bsize = cl->buf->last - cl->buf->pos;
|
2003-10-21 15:47:21 +08:00
|
|
|
|
2004-04-02 13:14:40 +08:00
|
|
|
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, p->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"pipe buf %p, pos %p, size: %z",
|
2004-05-28 23:49:23 +08:00
|
|
|
cl->buf->start, cl->buf->pos, bsize);
|
2003-10-21 15:47:21 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if ((size + bsize > p->temp_file_write_size)
|
|
|
|
|
|| (p->temp_file->offset + size + bsize > p->max_temp_file_size))
|
2003-10-21 01:14:07 +08:00
|
|
|
{
|
2003-04-15 01:04:58 +08:00
|
|
|
break;
|
|
|
|
|
}
|
2003-10-21 15:47:21 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
size += bsize;
|
2003-10-23 00:38:26 +08:00
|
|
|
ll = &cl->next;
|
|
|
|
|
cl = cl->next;
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
} while (cl);
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2004-11-11 22:07:14 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0, "size: %z", size);
|
2003-10-21 15:47:21 +08:00
|
|
|
|
2005-06-07 23:56:31 +08:00
|
|
|
if (ll == NULL) {
|
|
|
|
|
return NGX_BUSY;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
if (cl) {
|
|
|
|
|
p->in = cl;
|
|
|
|
|
*ll = NULL;
|
2003-10-21 01:14:07 +08:00
|
|
|
|
|
|
|
|
} else {
|
2003-10-22 00:49:56 +08:00
|
|
|
p->in = NULL;
|
2003-10-21 15:47:21 +08:00
|
|
|
p->last_in = &p->in;
|
2003-10-21 01:14:07 +08:00
|
|
|
}
|
2003-04-15 01:04:58 +08:00
|
|
|
|
|
|
|
|
} else {
|
2003-10-22 00:49:56 +08:00
|
|
|
p->in = NULL;
|
2003-10-21 15:47:21 +08:00
|
|
|
p->last_in = &p->in;
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
|
2003-11-03 06:56:18 +08:00
|
|
|
if (ngx_write_chain_to_temp_file(p->temp_file, out) == NGX_ERROR) {
|
2003-10-10 23:10:50 +08:00
|
|
|
return NGX_ABORT;
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
for (last_free = &p->free_raw_bufs;
|
2003-10-20 03:57:23 +08:00
|
|
|
*last_free != NULL;
|
2003-10-21 15:47:21 +08:00
|
|
|
last_free = &(*last_free)->next)
|
2003-10-20 03:57:23 +08:00
|
|
|
{
|
|
|
|
|
/* void */
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (p->buf_to_file) {
|
|
|
|
|
p->temp_file->offset = p->buf_to_file->last - p->buf_to_file->pos;
|
|
|
|
|
p->buf_to_file = NULL;
|
2003-11-18 00:15:03 +08:00
|
|
|
out = out->next;
|
2003-11-03 06:56:18 +08:00
|
|
|
}
|
|
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
for (cl = out; cl; cl = next) {
|
|
|
|
|
next = cl->next;
|
|
|
|
|
cl->next = NULL;
|
2003-04-15 01:04:58 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
b = cl->buf;
|
|
|
|
|
b->file = &p->temp_file->file;
|
|
|
|
|
b->file_pos = p->temp_file->offset;
|
|
|
|
|
p->temp_file->offset += b->last - b->pos;
|
|
|
|
|
b->file_last = p->temp_file->offset;
|
2003-11-06 01:03:41 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
b->in_file = 1;
|
|
|
|
|
b->temp_file = 1;
|
2003-10-22 15:05:29 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
if (p->out) {
|
|
|
|
|
*p->last_out = cl;
|
|
|
|
|
} else {
|
|
|
|
|
p->out = cl;
|
|
|
|
|
}
|
|
|
|
|
p->last_out = &cl->next;
|
2003-10-20 03:57:23 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (b->last_shadow) {
|
2004-10-11 23:07:03 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
tl = ngx_alloc_chain_link(p->pool);
|
|
|
|
|
if (tl == NULL) {
|
2005-01-25 20:27:35 +08:00
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tl->buf = b->shadow;
|
|
|
|
|
tl->next = NULL;
|
2004-10-11 23:07:03 +08:00
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
*last_free = tl;
|
|
|
|
|
last_free = &tl->next;
|
2005-01-25 20:27:35 +08:00
|
|
|
|
|
|
|
|
b->shadow->pos = b->shadow->start;
|
|
|
|
|
b->shadow->last = b->shadow->start;
|
|
|
|
|
|
|
|
|
|
ngx_event_pipe_remove_shadow_links(b->shadow);
|
2003-04-15 01:04:58 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
2003-04-15 23:06:52 +08:00
|
|
|
|
2003-04-21 22:55:47 +08:00
|
|
|
|
2003-04-15 23:06:52 +08:00
|
|
|
/* the copy input filter */
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_int_t ngx_event_pipe_copy_input_filter(ngx_event_pipe_t *p, ngx_buf_t *buf)
|
2003-04-15 23:06:52 +08:00
|
|
|
{
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_buf_t *b;
|
2003-10-23 00:38:26 +08:00
|
|
|
ngx_chain_t *cl;
|
2003-04-15 23:06:52 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (buf->pos == buf->last) {
|
2003-10-14 23:06:38 +08:00
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
2003-04-15 23:06:52 +08:00
|
|
|
|
2003-10-14 23:06:38 +08:00
|
|
|
if (p->free) {
|
2005-04-08 23:18:55 +08:00
|
|
|
cl = p->free;
|
|
|
|
|
b = cl->buf;
|
|
|
|
|
p->free = cl->next;
|
|
|
|
|
ngx_free_chain(p->pool, cl);
|
2003-04-15 23:06:52 +08:00
|
|
|
|
2003-10-14 23:06:38 +08:00
|
|
|
} else {
|
2005-03-19 20:38:37 +08:00
|
|
|
b = ngx_alloc_buf(p->pool);
|
|
|
|
|
if (b == NULL) {
|
2004-05-28 23:49:23 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
2003-10-14 23:06:38 +08:00
|
|
|
}
|
2003-04-15 23:06:52 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_memcpy(b, buf, sizeof(ngx_buf_t));
|
|
|
|
|
b->shadow = buf;
|
|
|
|
|
b->tag = p->tag;
|
|
|
|
|
b->last_shadow = 1;
|
|
|
|
|
b->recycled = 1;
|
|
|
|
|
buf->shadow = b;
|
2003-04-15 23:06:52 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
cl = ngx_alloc_chain_link(p->pool);
|
|
|
|
|
if (cl == NULL) {
|
2005-01-25 20:27:35 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cl->buf = b;
|
|
|
|
|
cl->next = NULL;
|
2004-02-12 01:08:49 +08:00
|
|
|
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0, "input buf #%d", b->num);
|
2004-02-12 01:08:49 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
if (p->in) {
|
|
|
|
|
*p->last_in = cl;
|
|
|
|
|
} else {
|
|
|
|
|
p->in = cl;
|
|
|
|
|
}
|
|
|
|
|
p->last_in = &cl->next;
|
2003-04-15 23:06:52 +08:00
|
|
|
|
2003-10-14 23:06:38 +08:00
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
static ngx_inline void ngx_event_pipe_remove_shadow_links(ngx_buf_t *buf)
|
2003-10-14 23:06:38 +08:00
|
|
|
{
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_buf_t *b, *next;
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2004-10-11 23:07:03 +08:00
|
|
|
b = buf->shadow;
|
|
|
|
|
|
|
|
|
|
if (b == NULL) {
|
2003-10-17 04:19:16 +08:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
while (!b->last_shadow) {
|
|
|
|
|
next = b->shadow;
|
2004-09-28 23:44:42 +08:00
|
|
|
|
2004-10-11 23:07:03 +08:00
|
|
|
b->temporary = 0;
|
|
|
|
|
b->recycled = 0;
|
2004-09-28 16:34:51 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
b->shadow = NULL;
|
|
|
|
|
b = next;
|
2003-10-17 04:19:16 +08:00
|
|
|
}
|
|
|
|
|
|
2004-10-11 23:07:03 +08:00
|
|
|
b->temporary = 0;
|
|
|
|
|
b->recycled = 0;
|
2004-09-28 23:44:42 +08:00
|
|
|
b->last_shadow = 0;
|
2003-10-17 04:19:16 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
b->shadow = NULL;
|
|
|
|
|
|
|
|
|
|
buf->shadow = NULL;
|
2003-10-14 23:06:38 +08:00
|
|
|
}
|
2003-04-15 23:06:52 +08:00
|
|
|
|
|
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
static ngx_inline void ngx_event_pipe_free_shadow_raw_buf(ngx_chain_t **free,
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_buf_t *buf)
|
2003-10-14 23:06:38 +08:00
|
|
|
{
|
2004-05-28 23:49:23 +08:00
|
|
|
ngx_buf_t *s;
|
2003-10-23 00:38:26 +08:00
|
|
|
ngx_chain_t *cl, **ll;
|
2003-04-15 23:06:52 +08:00
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (buf->shadow == NULL) {
|
2003-10-14 23:06:38 +08:00
|
|
|
return;
|
2003-04-15 23:06:52 +08:00
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
for (s = buf->shadow; !s->last_shadow; s = s->shadow) { /* void */ }
|
2003-10-14 23:06:38 +08:00
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
ll = free;
|
2003-10-14 23:06:38 +08:00
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
for (cl = *free ; cl; cl = cl->next) {
|
2004-05-28 23:49:23 +08:00
|
|
|
if (cl->buf == s) {
|
2003-10-23 00:38:26 +08:00
|
|
|
*ll = cl->next;
|
2003-10-14 23:06:38 +08:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
if (cl->buf->shadow) {
|
2003-10-14 23:06:38 +08:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
ll = &cl->next;
|
2003-10-14 23:06:38 +08:00
|
|
|
}
|
2003-04-15 23:06:52 +08:00
|
|
|
}
|
|
|
|
|
|
2003-10-14 23:06:38 +08:00
|
|
|
|
2005-01-25 20:27:35 +08:00
|
|
|
ngx_int_t ngx_event_pipe_add_free_buf(ngx_event_pipe_t *p, ngx_buf_t *b)
|
2003-10-14 23:06:38 +08:00
|
|
|
{
|
2005-01-25 20:27:35 +08:00
|
|
|
ngx_chain_t *cl;
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
cl = ngx_alloc_chain_link(p->pool);
|
|
|
|
|
if (cl == NULL) {
|
2005-01-25 20:27:35 +08:00
|
|
|
return NGX_ERROR;
|
2003-10-17 04:19:16 +08:00
|
|
|
}
|
|
|
|
|
|
2005-01-25 20:27:35 +08:00
|
|
|
b->pos = b->start;
|
|
|
|
|
b->last = b->start;
|
|
|
|
|
b->shadow = NULL;
|
2003-10-14 23:06:38 +08:00
|
|
|
|
2005-01-25 20:27:35 +08:00
|
|
|
cl->buf = b;
|
|
|
|
|
|
|
|
|
|
if (p->free_raw_bufs == NULL) {
|
|
|
|
|
p->free_raw_bufs = cl;
|
|
|
|
|
cl->next = NULL;
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
2003-10-14 23:06:38 +08:00
|
|
|
}
|
2005-01-25 20:27:35 +08:00
|
|
|
|
|
|
|
|
if (p->free_raw_bufs->buf->pos == p->free_raw_bufs->buf->last) {
|
|
|
|
|
|
|
|
|
|
/* add the free buf to the list start */
|
|
|
|
|
|
|
|
|
|
cl->next = p->free_raw_bufs;
|
|
|
|
|
p->free_raw_bufs = cl;
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* the first free buf is partialy filled, thus add the free buf after it */
|
|
|
|
|
|
|
|
|
|
cl->next = p->free_raw_bufs->next;
|
|
|
|
|
p->free_raw_bufs->next = cl;
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
2003-10-14 23:06:38 +08:00
|
|
|
}
|
2003-10-21 15:47:21 +08:00
|
|
|
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
static ngx_int_t ngx_event_pipe_drain_chains(ngx_event_pipe_t *p)
|
2003-10-21 15:47:21 +08:00
|
|
|
{
|
2003-10-23 00:38:26 +08:00
|
|
|
ngx_chain_t *cl, *tl;
|
2003-10-21 15:47:21 +08:00
|
|
|
|
|
|
|
|
for ( ;; ) {
|
|
|
|
|
if (p->busy) {
|
2003-10-23 00:38:26 +08:00
|
|
|
cl = p->busy;
|
2003-11-18 16:04:34 +08:00
|
|
|
p->busy = NULL;
|
2003-10-21 15:47:21 +08:00
|
|
|
|
|
|
|
|
} else if (p->out) {
|
2003-10-23 00:38:26 +08:00
|
|
|
cl = p->out;
|
2003-11-18 16:04:34 +08:00
|
|
|
p->out = NULL;
|
2003-10-21 15:47:21 +08:00
|
|
|
|
|
|
|
|
} else if (p->in) {
|
2003-10-23 00:38:26 +08:00
|
|
|
cl = p->in;
|
2003-11-18 16:04:34 +08:00
|
|
|
p->in = NULL;
|
2003-10-21 15:47:21 +08:00
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-23 00:38:26 +08:00
|
|
|
while (cl) {
|
2004-05-28 23:49:23 +08:00
|
|
|
if (cl->buf->last_shadow) {
|
2005-01-25 20:27:35 +08:00
|
|
|
if (ngx_event_pipe_add_free_buf(p, cl->buf->shadow) != NGX_OK) {
|
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
2005-01-18 21:03:58 +08:00
|
|
|
return NGX_ABORT;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
cl->buf->last_shadow = 0;
|
2003-10-21 15:47:21 +08:00
|
|
|
}
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
cl->buf->shadow = NULL;
|
2003-10-23 00:38:26 +08:00
|
|
|
tl = cl->next;
|
|
|
|
|
cl->next = p->free;
|
|
|
|
|
p->free = cl;
|
|
|
|
|
cl = tl;
|
2003-10-21 15:47:21 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|