Merge branch 'mb-throttle-test'

Merge in the new throttle code.
This commit is contained in:
Mic Bowman
2014-12-30 16:26:57 -08:00
7 changed files with 156 additions and 37 deletions

View File

@@ -544,6 +544,13 @@
;
;client_throttle_max_bps = 187500
; Minimum bytes per second to send to any single client as a result of
; adaptive throttling. Viewer preferences set to a lower number will
; override the settin. The example given here ensures that adaptive
; throttling will never decrease per client bandwidth below 256 kbps.
;
;adaptive_throttle_min_bps = 32000
; Adaptive throttling attempts to limit network overload when multiple
; clients login by starting each connection more slowly. Disabled by
; default