Mercurial > hg > nginx
diff src/http/ngx_http_write_filter_module.c @ 667:63a820b0bc6c release-0.3.55
nginx-0.3.55-RELEASE import
*) Feature: the "stub" parameter in the "include" SSI command.
*) Feature: the "block" SSI command.
*) Feature: the unicode2nginx script was added to contrib.
*) Bugfix: if a "root" was specified by variable only, then the root
was relative to a server prefix.
*) Bugfix: if the request contained "//" or "/./" and escaped symbols
after them, then the proxied request was sent unescaped.
*) Bugfix: the $r->headers_in("Cookie") of the ngx_http_perl_module now
returns all "Cookie" header lines.
*) Bugfix: a segmentation fault occurred if
"client_body_in_file_only on" was used and nginx switched to a next
upstream.
*) Bugfix: on some condition while reconfiguration character codes
inside the "charset_map" may be treated invalid; the bug had
appeared in 0.3.50.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 28 Jul 2006 15:16:17 +0000 |
parents | 9079ee4735ae |
children | 7e24168b0853 |
line wrap: on
line diff
--- a/src/http/ngx_http_write_filter_module.c +++ b/src/http/ngx_http_write_filter_module.c @@ -13,7 +13,7 @@ static ngx_int_t ngx_http_write_filter_init(ngx_cycle_t *cycle); -ngx_http_module_t ngx_http_write_filter_module_ctx = { +static ngx_http_module_t ngx_http_write_filter_module_ctx = { NULL, /* preconfiguration */ NULL, /* postconfiguration */ @@ -69,7 +69,7 @@ ngx_http_write_filter(ngx_http_request_t for (cl = r->out; cl; cl = cl->next) { ll = &cl->next; - ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0, + ngx_log_debug7(NGX_LOG_DEBUG_EVENT, c->log, 0, "write old buf t:%d f:%d %p, pos %p, size: %z " "file: %O, size: %z", cl->buf->temporary, cl->buf->in_file, @@ -80,7 +80,7 @@ ngx_http_write_filter(ngx_http_request_t #if 1 if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) { - ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, + ngx_log_error(NGX_LOG_ALERT, c->log, 0, "zero size buf in writer " "t:%d r:%d f:%d %p %p-%p %p %O-%O", cl->buf->temporary, @@ -121,7 +121,7 @@ ngx_http_write_filter(ngx_http_request_t *ll = cl; ll = &cl->next; - ngx_log_debug7(NGX_LOG_DEBUG_EVENT, r->connection->log, 0, + ngx_log_debug7(NGX_LOG_DEBUG_EVENT, c->log, 0, "write new buf t:%d f:%d %p, pos %p, size: %z " "file: %O, size: %z", cl->buf->temporary, cl->buf->in_file, @@ -132,7 +132,7 @@ ngx_http_write_filter(ngx_http_request_t #if 1 if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) { - ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, + ngx_log_error(NGX_LOG_ALERT, c->log, 0, "zero size buf in writer " "t:%d r:%d f:%d %p %p-%p %p %O-%O", cl->buf->temporary, @@ -201,7 +201,7 @@ ngx_http_write_filter(ngx_http_request_t return NGX_OK; } - ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, + ngx_log_error(NGX_LOG_ALERT, c->log, 0, "the http output chain is empty"); ngx_debug_point(); @@ -214,8 +214,8 @@ ngx_http_write_filter(ngx_http_request_t if (to_send <= 0) { c->write->delayed = 1; - ngx_add_timer(r->connection->write, - (ngx_msec_t) (- to_send * 1000 / r->limit_rate + 1)); + ngx_add_timer(c->write, + (ngx_msec_t) (- to_send * 1000 / r->limit_rate + 1)); c->buffered |= NGX_HTTP_WRITE_BUFFERED; @@ -244,8 +244,7 @@ ngx_http_write_filter(ngx_http_request_t if (to_send) { sent = c->sent - sent; c->write->delayed = 1; - ngx_add_timer(r->connection->write, - (ngx_msec_t) (sent * 1000 / r->limit_rate + 1)); + ngx_add_timer(c->write, (ngx_msec_t) (sent * 1000 / r->limit_rate + 1)); } for (cl = r->out; cl && cl != chain; /* void */) {