[nginx] svn commit: r5043 - in branches/stable-1.2: . src/http

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-02-10 03:20:00 +0000 (Sun, 10 Feb 2013)
New Revision: 5043
URL: http://trac.nginx.org/nginx/changeset/5043/nginx

Log:
Merge of r4962: limit_rate fix.

Limit rate: fixed integer overflow in limit calculation (ticket #256).

Patch by Alexey Antropov.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/ngx_http_write_filter_module.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2013-02-10 03:18:08 UTC (rev 5042)
+++ branches/stable-1.2	2013-02-10 03:20:00 UTC (rev 5043)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961,4964,4973,4978,4984,5011
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4962,4964,4973,4978,4984,5011
\ No newline at end of property
Modified: branches/stable-1.2/src/http/ngx_http_write_filter_module.c
===================================================================
--- branches/stable-1.2/src/http/ngx_http_write_filter_module.c	2013-02-10 03:18:08 UTC (rev 5042)
+++ branches/stable-1.2/src/http/ngx_http_write_filter_module.c	2013-02-10 03:20:00 UTC (rev 5043)
@@ -207,7 +207,7 @@
     }
 
     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) {