Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_write_filter_module.c @ 496:f39b9e29530d NGINX_0_8_0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.0 *) Feature: the "keepalive_requests" directive. *) Feature: the "limit_rate_after" directive. Thanks to Ivan Debnar. *) Bugfix: XLST filter did not work in subrequests. *) Bugfix: in relative paths handling in nginx/Windows. *) Bugfix: in proxy_store, fastcgi_store, proxy_cache, and fastcgi_cache in nginx/Windows. *) Bugfix: in memory allocation error handling. Thanks to Maxim Dounin and Kirill A. Korinskiy.
author Igor Sysoev <http://sysoev.ru>
date Tue, 02 Jun 2009 00:00:00 +0400
parents 79c5df00501e
children 9d21dad0b5a1
comparison
equal deleted inserted replaced
495:6d9fb4461113 496:f39b9e29530d
44 44
45 45
46 ngx_int_t 46 ngx_int_t
47 ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) 47 ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
48 { 48 {
49 off_t size, sent, limit; 49 off_t size, sent, nsent, limit;
50 ngx_uint_t last, flush; 50 ngx_uint_t last, flush;
51 ngx_msec_t delay; 51 ngx_msec_t delay;
52 ngx_chain_t *cl, *ln, **ll, *chain; 52 ngx_chain_t *cl, *ln, **ll, *chain;
53 ngx_connection_t *c; 53 ngx_connection_t *c;
54 ngx_http_core_loc_conf_t *clcf; 54 ngx_http_core_loc_conf_t *clcf;
208 208
209 return NGX_ERROR; 209 return NGX_ERROR;
210 } 210 }
211 211
212 if (r->limit_rate) { 212 if (r->limit_rate) {
213 limit = r->limit_rate * (ngx_time() - r->start_sec + 1) - c->sent; 213 limit = r->limit_rate * (ngx_time() - r->start_sec + 1)
214 - (c->sent - clcf->limit_rate_after);
214 215
215 if (limit <= 0) { 216 if (limit <= 0) {
216 c->write->delayed = 1; 217 c->write->delayed = 1;
217 ngx_add_timer(c->write, 218 ngx_add_timer(c->write,
218 (ngx_msec_t) (- limit * 1000 / r->limit_rate + 1)); 219 (ngx_msec_t) (- limit * 1000 / r->limit_rate + 1));
243 c->error = 1; 244 c->error = 1;
244 return NGX_ERROR; 245 return NGX_ERROR;
245 } 246 }
246 247
247 if (r->limit_rate) { 248 if (r->limit_rate) {
248 delay = (ngx_msec_t) ((c->sent - sent) * 1000 / r->limit_rate + 1); 249
250 nsent = c->sent;
251
252 if (clcf->limit_rate_after) {
253
254 sent -= clcf->limit_rate_after;
255 if (sent < 0) {
256 sent = 0;
257 }
258
259 nsent -= clcf->limit_rate_after;
260 if (nsent < 0) {
261 nsent = 0;
262 }
263 }
264
265 delay = (ngx_msec_t) ((nsent - sent) * 1000 / r->limit_rate + 1);
249 266
250 if (delay > 0) { 267 if (delay > 0) {
251 c->write->delayed = 1; 268 c->write->delayed = 1;
252 ngx_add_timer(c->write, delay); 269 ngx_add_timer(c->write, delay);
253 } 270 }