diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-02-02 12:11:08 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-02-02 12:11:08 -0800 |
| commit | 70d4c0ad7da483df2b5e621dd20467b4fd67ab51 (patch) | |
| tree | 271192a64c7179e8a08eddb68afc42cc79754098 | |
| parent | b9292fdef74954ac9cd95ddaca36bceb26ef1d6c (diff) | |
MAINT-6067: There appears to be an issue with HTTP pipelining and timeouts in CURL that has never been resolved (see https://github.com/bagder/curl/issues/627). Until resolved disable pipelining for meshes and textures.
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 2 | ||||
| -rwxr-xr-x | indra/newview/llappcorehttp.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d5549013fa..46fd9a27e3 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4557,7 +4557,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>HttpRangeRequestsDisable</key> <map> diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp index 8c276c0fe9..c13c4f982a 100755 --- a/indra/newview/llappcorehttp.cpp +++ b/indra/newview/llappcorehttp.cpp @@ -104,7 +104,7 @@ static const struct "material manager requests" }, { // AP_AGENT - 2, 1, 32, 0, true, + 2, 1, 32, 0, false, "Agent", "Agent requests" } @@ -125,7 +125,7 @@ LLAppCoreHttp::LLAppCoreHttp() mStopHandle(LLCORE_HTTP_HANDLE_INVALID), mStopRequested(0.0), mStopped(false), - mPipelined(true) + mPipelined(false) {} @@ -359,13 +359,14 @@ void LLAppCoreHttp::refreshSettings(bool initial) static const std::string http_pipelining("HttpPipelining"); if (gSavedSettings.controlExists(http_pipelining)) { - // Default to true (in ctor) if absent. + // Default to false (in ctor) if absent. bool pipelined(gSavedSettings.getBOOL(http_pipelining)); if (pipelined != mPipelined) { mPipelined = pipelined; pipeline_changed = true; } + LL_INFOS("Init") << "HTTP Pipelining " << (mPipelined ? "enabled" : "disabled") << "!" << LL_ENDL; } for (int i(0); i < LL_ARRAY_SIZE(init_data); ++i) |