diff options
| author | simon <none@none> | 2014-11-03 17:54:24 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-11-03 17:54:24 -0800 |
| commit | fa7610fea599a98cc6e79d3835a14f8e5ca2b6b1 (patch) | |
| tree | 74633f5e484e24b71c563941b37d5843b688d9c3 /indra/llcorehttp/_httppolicyclass.cpp | |
| parent | 4b333e36d1814f1aadf8e57a1810ecdc6a6b9757 (diff) | |
| parent | a669303f8528639b539a793c1dc2d8572beefe80 (diff) | |
Merge downstream code and become 3.7.20
Diffstat (limited to 'indra/llcorehttp/_httppolicyclass.cpp')
| -rwxr-xr-x | indra/llcorehttp/_httppolicyclass.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcorehttp/_httppolicyclass.cpp b/indra/llcorehttp/_httppolicyclass.cpp index f34a8e9f1e..2c0f650155 100755 --- a/indra/llcorehttp/_httppolicyclass.cpp +++ b/indra/llcorehttp/_httppolicyclass.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 @@ -78,8 +78,8 @@ HttpStatus HttpPolicyClass::set(HttpRequest::EPolicyOption opt, long value) mPerHostConnectionLimit = llclamp(value, long(HTTP_CONNECTION_LIMIT_MIN), mConnectionLimit); break; - case HttpRequest::PO_ENABLE_PIPELINING: - mPipelining = llclamp(value, 0L, 1L); + case HttpRequest::PO_PIPELINING_DEPTH: + mPipelining = llclamp(value, 0L, HTTP_PIPELINING_MAX); break; case HttpRequest::PO_THROTTLE_RATE: @@ -106,7 +106,7 @@ HttpStatus HttpPolicyClass::get(HttpRequest::EPolicyOption opt, long * value) co *value = mPerHostConnectionLimit; break; - case HttpRequest::PO_ENABLE_PIPELINING: + case HttpRequest::PO_PIPELINING_DEPTH: *value = mPipelining; break; |