# HG changeset patch # User Matthew Wild # Date 1506444560 -3600 # Node ID 8b470cf497b72d3bad9bba3418070f26d1acbfb7 # Parent e21d82551e055f88d1b78f095014e9e4bd552f58# Parent 25237002aba4095b174cd0b99ab6765a8e864ea4 Merge 0.10->trunk diff -r e21d82551e05 -r 8b470cf497b7 plugins/mod_limits.lua --- a/plugins/mod_limits.lua Tue Sep 26 17:24:25 2017 +0100 +++ b/plugins/mod_limits.lua Tue Sep 26 17:49:20 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);