Mercurial > hg > nginx-vendor-0-7

comparison src/http/ngx_http_write_filter_module.c @ 502:89dc5654117c NGINX_0_7_63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.63 *) Security: now "/../" are disabled in "Destination" request header line. *) Change: minimum supported OpenSSL version is 0.9.7. *) Change: the "ask" parameter of the "ssl_verify_client" directive was changed to the "optional" parameter and now it checks a client certificate if it was offered. Thanks to Brice Figureau. *) Feature: now the "-V" switch shows TLS SNI support. *) Feature: the $ssl_client_verify variable. Thanks to Brice Figureau. *) Feature: the "ssl_crl" directive. Thanks to Brice Figureau. *) Bugfix: the $ssl_client_cert variable usage corrupted memory; the bug had appeared in 0.7.7. Thanks to Sergey Zhuravlev. *) Feature: now the start cache loader runs in a separate process; this should improve large caches handling. *) Feature: now temporary files and permanent storage area may reside at different file systems. *) Bugfix: nginx counted incorrectly disk cache size. *) Change: now directive "gzip_disable msie6" does not disable gzipping for MSIE 6.0 SV1. *) Bugfix: nginx always added "Vary: Accept-Encoding" response header line, if both "gzip_static" and "gzip_vary" were on. *) Feature: the "proxy" parameter of the "geo" directive. *) Feature: the ngx_http_geoip_module. *) Feature: the "limit_rate_after" directive. Thanks to Ivan Debnar. *) Feature: the "limit_req_log_level" and "limit_conn_log_level" directives. *) Bugfix: now "limit_req" directive conforms to the leaky bucket algorithm. Thanks to Maxim Dounin. *) Bugfix: in ngx_http_limit_req_module. Thanks to Maxim Dounin. *) Bugfix: now nginx allows underscores in a request method. *) Bugfix: "proxy_pass_header" and "fastcgi_pass_header" directives did not pass to a client the "X-Accel-Redirect", "X-Accel-Limit-Rate", "X-Accel-Buffering", and "X-Accel-Charset" lines from backend response header. Thanks to Maxim Dounin. *) Bugfix: in handling "Last-Modified" and "Accept-Ranges" backend response header lines; the bug had appeared in 0.7.44. Thanks to Maxim Dounin. *) Feature: the "image_filter_transparency" directive. *) Feature: the "image_filter" directive supports variables for setting size. *) Bugfix: in PNG alpha-channel support in the ngx_http_image_filter_module. *) Bugfix: in transparency support in the ngx_http_image_filter_module. *) Feature: now several "perl_modules" directives may be used. *) Bugfix: ngx_http_perl_module responses did not work in subrequests. *) Bugfix: nginx sent '\0' in a "Location" response header line on MKCOL request. Thanks to Xie Zhenye. *) Bugfix: an "error_page" directive did not redirect a 413 error; the bug had appeared in 0.6.10. *) Bugfix: in memory allocation error handling. Thanks to Maxim Dounin and Kirill A. Korinskiy.
author Igor Sysoev <http://sysoev.ru>
date Mon, 26 Oct 2009 00:00:00 +0300
parents 79c5df00501e
children
comparison
equal deleted inserted replaced
501:dc87c92181c7 502:89dc5654117c
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 }