Software / code / prosody
Changeset
8269:25237002aba4
mod_limits: Handle fractional outstanding balance values (caused by e3f7b6fa46ba)
Fractional values were passed to string.sub() when doing buffer manipulations, and
caused random bytes to be skipped in the stream.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 26 Sep 2017 17:48:33 +0100 |
| parents | 8267:42fad8465537 |
| children | 8270:8b470cf497b7 8272:64165865b131 |
| files | plugins/mod_limits.lua |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_limits.lua Mon Sep 25 23:12:47 2017 +0100 +++ b/plugins/mod_limits.lua Tue Sep 26 17:48:33 2017 +0100 @@ -4,6 +4,7 @@ local filters = require "util.filters"; local throttle = require "util.throttle"; local timer = require "util.timer"; +local ceil = math.ceil; local limits_cfg = module:get_option("limits", {}); local limits_resolution = module:get_option_number("limits_resolution", 1); @@ -55,6 +56,7 @@ local ok, balance, outstanding = throttle:poll(#bytes, true); if not ok then session.log("debug", "Session over rate limit (%d) with %d (by %d), pausing", throttle.max, #bytes, outstanding); + outstanding = ceil(outstanding); session.conn:pause(); -- Read no more data from the connection until there is no outstanding data local outstanding_data = bytes:sub(-outstanding); bytes = bytes:sub(1, #bytes-outstanding);
