2004-05-28 23:49:23 +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
|
|
|
*/
|
|
|
|
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
#include <ngx_config.h>
|
|
|
|
#include <ngx_core.h>
|
|
|
|
|
|
|
|
|
2005-03-04 22:06:57 +08:00
|
|
|
ngx_buf_t *
|
|
|
|
ngx_create_temp_buf(ngx_pool_t *pool, size_t size)
|
2004-05-28 23:49:23 +08:00
|
|
|
{
|
|
|
|
ngx_buf_t *b;
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
b = ngx_calloc_buf(pool);
|
|
|
|
if (b == NULL) {
|
2004-05-28 23:49:23 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
b->start = ngx_palloc(pool, size);
|
|
|
|
if (b->start == NULL) {
|
2004-05-28 23:49:23 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-03-04 22:06:57 +08:00
|
|
|
/*
|
|
|
|
* set by ngx_calloc_buf():
|
|
|
|
*
|
|
|
|
* b->file_pos = 0;
|
|
|
|
* b->file_last = 0;
|
|
|
|
* b->file = NULL;
|
|
|
|
* b->shadow = NULL;
|
|
|
|
* b->tag = 0;
|
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
|
|
|
* and flags
|
2005-03-04 22:06:57 +08:00
|
|
|
*/
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
b->pos = b->start;
|
|
|
|
b->last = b->start;
|
|
|
|
b->end = b->last + size;
|
|
|
|
b->temporary = 1;
|
|
|
|
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-04-08 23:18:55 +08:00
|
|
|
ngx_chain_t *
|
|
|
|
ngx_alloc_chain_link(ngx_pool_t *pool)
|
|
|
|
{
|
|
|
|
ngx_chain_t *cl;
|
|
|
|
|
|
|
|
cl = pool->chain;
|
|
|
|
|
|
|
|
if (cl) {
|
|
|
|
pool->chain = cl->next;
|
|
|
|
return cl;
|
|
|
|
}
|
|
|
|
|
|
|
|
cl = ngx_palloc(pool, sizeof(ngx_chain_t));
|
|
|
|
if (cl == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cl;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-03-04 22:06:57 +08:00
|
|
|
ngx_chain_t *
|
|
|
|
ngx_create_chain_of_bufs(ngx_pool_t *pool, ngx_bufs_t *bufs)
|
2004-05-28 23:49:23 +08:00
|
|
|
{
|
|
|
|
u_char *p;
|
|
|
|
ngx_int_t i;
|
|
|
|
ngx_buf_t *b;
|
|
|
|
ngx_chain_t *chain, *cl, **ll;
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
p = ngx_palloc(pool, bufs->num * bufs->size);
|
|
|
|
if (p == NULL) {
|
2004-05-28 23:49:23 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ll = &chain;
|
|
|
|
|
|
|
|
for (i = 0; i < bufs->num; i++) {
|
2005-03-19 20:38:37 +08:00
|
|
|
|
|
|
|
b = ngx_calloc_buf(pool);
|
|
|
|
if (b == NULL) {
|
2004-05-28 23:49:23 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-03-04 22:06:57 +08:00
|
|
|
/*
|
|
|
|
* set by ngx_calloc_buf():
|
|
|
|
*
|
|
|
|
* b->file_pos = 0;
|
|
|
|
* b->file_last = 0;
|
|
|
|
* b->file = NULL;
|
|
|
|
* b->shadow = NULL;
|
|
|
|
* b->tag = 0;
|
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
|
|
|
* and flags
|
2005-03-04 22:06:57 +08:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2004-05-28 23:49:23 +08:00
|
|
|
b->pos = p;
|
|
|
|
b->last = p;
|
|
|
|
b->temporary = 1;
|
|
|
|
|
|
|
|
b->start = p;
|
|
|
|
p += bufs->size;
|
|
|
|
b->end = p;
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
cl = ngx_alloc_chain_link(pool);
|
|
|
|
if (cl == NULL) {
|
2004-05-28 23:49:23 +08:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
cl->buf = b;
|
|
|
|
*ll = cl;
|
|
|
|
ll = &cl->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
*ll = NULL;
|
|
|
|
|
|
|
|
return chain;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-03-04 22:06:57 +08:00
|
|
|
ngx_int_t
|
|
|
|
ngx_chain_add_copy(ngx_pool_t *pool, ngx_chain_t **chain, ngx_chain_t *in)
|
2004-05-28 23:49:23 +08:00
|
|
|
{
|
|
|
|
ngx_chain_t *cl, **ll;
|
|
|
|
|
|
|
|
ll = chain;
|
|
|
|
|
|
|
|
for (cl = *chain; cl; cl = cl->next) {
|
|
|
|
ll = &cl->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (in) {
|
2005-03-19 20:38:37 +08:00
|
|
|
cl = ngx_alloc_chain_link(pool);
|
|
|
|
if (cl == NULL) {
|
|
|
|
return NGX_ERROR;
|
|
|
|
}
|
2004-05-28 23:49:23 +08:00
|
|
|
|
|
|
|
cl->buf = in->buf;
|
|
|
|
*ll = cl;
|
|
|
|
ll = &cl->next;
|
|
|
|
in = in->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
*ll = NULL;
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-11-26 18:11:11 +08:00
|
|
|
ngx_chain_t *
|
|
|
|
ngx_chain_get_free_buf(ngx_pool_t *p, ngx_chain_t **free)
|
|
|
|
{
|
|
|
|
ngx_chain_t *cl;
|
|
|
|
|
|
|
|
if (*free) {
|
|
|
|
cl = *free;
|
|
|
|
*free = cl->next;
|
|
|
|
cl->next = NULL;
|
|
|
|
return cl;
|
|
|
|
}
|
|
|
|
|
|
|
|
cl = ngx_alloc_chain_link(p);
|
|
|
|
if (cl == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
cl->buf = ngx_calloc_buf(p);
|
|
|
|
if (cl->buf == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
cl->next = NULL;
|
|
|
|
|
|
|
|
return cl;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-03-04 22:06:57 +08:00
|
|
|
void
|
|
|
|
ngx_chain_update_chains(ngx_chain_t **free, ngx_chain_t **busy,
|
|
|
|
ngx_chain_t **out, ngx_buf_tag_t tag)
|
2004-05-28 23:49:23 +08:00
|
|
|
{
|
2005-03-04 22:06:57 +08:00
|
|
|
ngx_chain_t *cl;
|
2004-05-28 23:49:23 +08:00
|
|
|
|
|
|
|
if (*busy == NULL) {
|
|
|
|
*busy = *out;
|
|
|
|
|
|
|
|
} else {
|
2005-03-04 22:06:57 +08:00
|
|
|
for (cl = *busy; cl->next; cl = cl->next) { /* void */ }
|
2004-10-21 23:34:38 +08:00
|
|
|
|
2005-03-04 22:06:57 +08:00
|
|
|
cl->next = *out;
|
2004-05-28 23:49:23 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
*out = NULL;
|
|
|
|
|
|
|
|
while (*busy) {
|
|
|
|
if (ngx_buf_size((*busy)->buf) != 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((*busy)->buf->tag != tag) {
|
|
|
|
*busy = (*busy)->next;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2004-10-11 23:07:03 +08:00
|
|
|
(*busy)->buf->pos = (*busy)->buf->start;
|
|
|
|
(*busy)->buf->last = (*busy)->buf->start;
|
2004-05-28 23:49:23 +08:00
|
|
|
|
2005-03-04 22:06:57 +08:00
|
|
|
cl = *busy;
|
|
|
|
*busy = cl->next;
|
|
|
|
cl->next = *free;
|
|
|
|
*free = cl;
|
2004-05-28 23:49:23 +08:00
|
|
|
}
|
|
|
|
}
|