Mercurial > hg > nginx-vendor-current
diff src/core/ngx_buf.c @ 48:6cfc63e68377 NGINX_0_1_24
nginx 0.1.24
*) Feature: the ngx_http_ssi_filter_module supports the QUERY_STRING
and DOCUMENT_URI variables.
*) Bugfix: the ngx_http_autoindex_module may some times return the 404
response for existent directory, if this directory was used in
"alias" directive.
*) Bugfix: the ngx_http_ssi_filter_module ran incorrectly for large
responses.
*) Bugfix: the lack of the "Referer" header line was always accounted
as valid referrer.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Fri, 04 Mar 2005 00:00:00 +0300 |
parents | 6f8b0dc0f8dd |
children | 72eb30262aac |
line wrap: on
line diff
--- a/src/core/ngx_buf.c +++ b/src/core/ngx_buf.c @@ -8,7 +8,8 @@ #include <ngx_core.h> -ngx_buf_t *ngx_create_temp_buf(ngx_pool_t *pool, size_t size) +ngx_buf_t * +ngx_create_temp_buf(ngx_pool_t *pool, size_t size) { ngx_buf_t *b; @@ -20,28 +21,28 @@ ngx_buf_t *ngx_create_temp_buf(ngx_pool_ return NULL; } + /* + * set by ngx_calloc_buf(): + * + * b->file_pos = 0; + * b->file_last = 0; + * b->file = NULL; + * b->shadow = NULL; + * b->tag = 0; + * + */ + b->pos = b->start; b->last = b->start; b->end = b->last + size; b->temporary = 1; - /* - - b->file_pos = 0; - b->file_last = 0; - - b->file = NULL; - b->shadow = NULL; - - b->tag = 0; - - */ - return b; } -ngx_chain_t *ngx_create_chain_of_bufs(ngx_pool_t *pool, ngx_bufs_t *bufs) +ngx_chain_t * +ngx_create_chain_of_bufs(ngx_pool_t *pool, ngx_bufs_t *bufs) { u_char *p; ngx_int_t i; @@ -59,6 +60,17 @@ ngx_chain_t *ngx_create_chain_of_bufs(ng return NULL; } + /* + * set by ngx_calloc_buf(): + * + * b->file_pos = 0; + * b->file_last = 0; + * b->file = NULL; + * b->shadow = NULL; + * b->tag = 0; + * + */ + b->pos = p; b->last = p; b->temporary = 1; @@ -67,15 +79,6 @@ ngx_chain_t *ngx_create_chain_of_bufs(ng p += bufs->size; b->end = p; - /* - b->file_pos = 0; - b->file_last = 0; - - b->file = NULL; - b->shadow = NULL; - b->tag = 0; - */ - if (!(cl = ngx_alloc_chain_link(pool))) { return NULL; } @@ -91,8 +94,8 @@ ngx_chain_t *ngx_create_chain_of_bufs(ng } -ngx_int_t ngx_chain_add_copy(ngx_pool_t *pool, ngx_chain_t **chain, - ngx_chain_t *in) +ngx_int_t +ngx_chain_add_copy(ngx_pool_t *pool, ngx_chain_t **chain, ngx_chain_t *in) { ngx_chain_t *cl, **ll; @@ -117,20 +120,19 @@ ngx_int_t ngx_chain_add_copy(ngx_pool_t } -void ngx_chain_update_chains(ngx_chain_t **free, ngx_chain_t **busy, - ngx_chain_t **out, ngx_buf_tag_t tag) +void +ngx_chain_update_chains(ngx_chain_t **free, ngx_chain_t **busy, + ngx_chain_t **out, ngx_buf_tag_t tag) { - ngx_chain_t *tl; + ngx_chain_t *cl; if (*busy == NULL) { *busy = *out; } else { - for (tl = *busy; tl->next; tl = tl->next) { - /* void */; - } + for (cl = *busy; cl->next; cl = cl->next) { /* void */ } - tl->next = *out; + cl->next = *out; } *out = NULL; @@ -154,9 +156,9 @@ void ngx_chain_update_chains(ngx_chain_t (*busy)->buf->pos = (*busy)->buf->start; (*busy)->buf->last = (*busy)->buf->start; - tl = *busy; - *busy = (*busy)->next; - tl->next = *free; - *free = tl; + cl = *busy; + *busy = cl->next; + cl->next = *free; + *free = cl; } }