diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-06-23 18:45:12 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-06-23 18:45:12 -0400 |
| commit | c49ac5ded1168baf3f52586b961f7ed35a8bb999 (patch) | |
| tree | ce5531ee2d2044efbb6a3b382764f16c8b276d9b /indra/llcorehttp/_httppolicy.cpp | |
| parent | 053f436413c01e237accabace4dc5ff1eccca837 (diff) | |
| parent | 5cca78e718f15522cc3db9aec76aa910dd696aa8 (diff) | |
Automated merge with ssh://bitbucket.org/monty_linden/viewer-library-refresh
Diffstat (limited to 'indra/llcorehttp/_httppolicy.cpp')
| -rwxr-xr-x | indra/llcorehttp/_httppolicy.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/llcorehttp/_httppolicy.cpp b/indra/llcorehttp/_httppolicy.cpp index fd5a93e192..bb7959b578 100755 --- a/indra/llcorehttp/_httppolicy.cpp +++ b/indra/llcorehttp/_httppolicy.cpp @@ -4,7 +4,7 @@ * * $LicenseInfo:firstyear=2012&license=viewerlgpl$ * Second Life Viewer Source Code - * Copyright (C) 2012-2013, Linden Research, Inc. + * Copyright (C) 2012-2014, Linden Research, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -128,7 +128,8 @@ void HttpPolicy::shutdown() void HttpPolicy::start() -{} +{ +} void HttpPolicy::addOp(HttpOpRequest * op) @@ -234,7 +235,11 @@ HttpService::ELoopSpeed HttpPolicy::processReadyQueue() } int active(transport.getActiveCountInClass(policy_class)); - int needed(state.mOptions.mConnectionLimit - active); // Expect negatives here + int active_limit(state.mOptions.mPipelining > 1L + ? (state.mOptions.mPerHostConnectionLimit + * state.mOptions.mPipelining) + : state.mOptions.mConnectionLimit); + int needed(active_limit - active); // Expect negatives here if (needed > 0) { |