diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-12-13 20:29:07 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-12-13 20:29:07 +0200 |
| commit | dcff9513f1b6d2b2dca9ec5f3bb9597992c0f9f2 (patch) | |
| tree | 0e6f15dc86c6e8edd75fc8591351f231488ac17c | |
| parent | 0d836acf0052ae294c7ebeb228632f1d36941fff (diff) | |
MAINT-6978 Proxy should not be initialized outside of startLLProxy()
| -rw-r--r-- | indra/llcorehttp/_httpoprequest.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp index db57869a1b..07cc0e4625 100644 --- a/indra/llcorehttp/_httpoprequest.cpp +++ b/indra/llcorehttp/_httpoprequest.cpp @@ -568,7 +568,17 @@ HttpStatus HttpOpRequest::prepareRequest(HttpService * service) // Use the viewer-based thread-safe API which has a // fast/safe check for proxy enable. Would like to // encapsulate this someway... - LLProxy::getInstance()->applyProxySettings(mCurlHandle); + if (LLProxy::instanceExists()) + { + // Make sure proxy won't be initialized from here, + // it might conflict with LLStartUp::startLLProxy() + LLProxy::getInstance()->applyProxySettings(mCurlHandle); + } + else + { + LL_WARNS() << "Proxy is not initialized!" << LL_ENDL; + } + } else if (gpolicy.mHttpProxy.size()) { |