livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for BUG-768

master
Nat Goodspeed 2012-12-04 21:10:30 -05:00
parent 68fffbc5e3 87b4386ac6
commit cc2c426e88
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -370,3 +370,4 @@ f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246
f72b50ef168c159d6e79e97aa2bcafaf8577ab99 DRTVWR-230
b418be80903520c492e1173f3afbc4021cad5d07 DRTVWR-255
965b9a35e260c0f53be1a25f0db7abc8a67eaf47 DRTVWR-252
bb10adc4f76cf0067fca7075146f00cdc0740e9d DRTVWR-251

10
indra/llcorehttp/_httpinternal.h
View File

@ -111,7 +111,15 @@ const int HTTP_TRACE_MIN = HTTP_TRACE_OFF;
const int HTTP_TRACE_MAX = HTTP_TRACE_CURL_BODIES;
// Request retry limits
const int HTTP_RETRY_COUNT_DEFAULT = 5;
//
// At a minimum, retries need to extend past any throttling
// window we're expecting from central services. In the case
// of Linden services running through the caps routers, there's
// a five-second or so window for throttling with some spillover.
// We want to span a few windows to allow transport to slow
// after onset of the throttles and then recover without a final
// failure. Other systems may need other constants.
const int HTTP_RETRY_COUNT_DEFAULT = 8;
const int HTTP_RETRY_COUNT_MIN = 0;
const int HTTP_RETRY_COUNT_MAX = 100;

6
indra/llcorehttp/examples/http_texture_load.cpp
View File

@ -153,6 +153,7 @@ public:
//
int main(int argc, char** argv)
{
LLCore::HttpStatus status;
bool do_random(false);
bool do_verbose(false);
@ -215,6 +216,9 @@ int main(int argc, char** argv)
// Initialization
init_curl();
LLCore::HttpRequest::createService();
LLCore::HttpRequest::setPolicyClassOption(LLCore::HttpRequest::DEFAULT_POLICY_ID,
LLCore::HttpRequest::CP_CONNECTION_LIMIT,
concurrency_limit);
LLCore::HttpRequest::startThread();
// Get service point
@ -228,7 +232,7 @@ int main(int argc, char** argv)
ws.loadTextureUuids(uuids);
ws.mRandomRange = do_random;
ws.mVerbose = do_verbose;
ws.mMaxConcurrency = concurrency_limit;
ws.mMaxConcurrency = 100;
if (! ws.mTextures.size())
{