summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2013-02-10 03:20:00 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2013-02-10 03:20:00 +0000
commit4b78ff952f8c7742429430c640130b8ad95e4c3b (patch)
treefc6f036f85058bd6db8de6ab28b3fb782943d312
parenta2107a6705bc3decb05125e0ff4b35de418b9068 (diff)
downloadnginx-4b78ff952f8c7742429430c640130b8ad95e4c3b.tar.gz
Merge of r4962: limit_rate fix.
Limit rate: fixed integer overflow in limit calculation (ticket #256). Patch by Alexey Antropov.
-rw-r--r--src/http/ngx_http_write_filter_module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_write_filter_module.c b/src/http/ngx_http_write_filter_module.c
index fd44bc659..5594c7faa 100644
--- a/src/http/ngx_http_write_filter_module.c
+++ b/src/http/ngx_http_write_filter_module.c
@@ -207,7 +207,7 @@ ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)
}
if (r->limit_rate) {
- limit = r->limit_rate * (ngx_time() - r->start_sec + 1)
+ limit = (off_t) r->limit_rate * (ngx_time() - r->start_sec + 1)
- (c->sent - clcf->limit_rate_after);
if (limit <= 0) {