diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2012-01-20 11:55:15 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2012-01-20 11:55:15 -0700 |
| commit | 9e6a5d721193f181c39e58fe00073bece74b081a (patch) | |
| tree | bcc8aa49ccf5e8b0ce528a888a46efaabf4d263b /indra/llmessage/llcurl.cpp | |
| parent | 25c21c3761d871fa7927e2a5656ed18100084454 (diff) | |
fix for SH-2823 and SH-2824: LLCurl crash inside LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers
Diffstat (limited to 'indra/llmessage/llcurl.cpp')
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 5edf0dc8c0..1ab82a273b 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -228,6 +228,8 @@ LLMutex* LLCurl::Easy::sHandleMutexp = NULL ; //static CURL* LLCurl::Easy::allocEasyHandle() { + llassert(LLCurl::getCurlThread()) ; + CURL* ret = NULL; LLMutexLock lock(sHandleMutexp) ; @@ -489,6 +491,7 @@ void LLCurl::Easy::prepRequest(const std::string& url, LLProxy::getInstance()->applyProxySettings(this); mOutput.reset(new LLBufferArray); + mOutput->setThreaded(true); setopt(CURLOPT_WRITEFUNCTION, (void*)&curlWriteCallback); setopt(CURLOPT_WRITEDATA, (void*)this); |