diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-03 17:49:19 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-03 17:49:19 -0500 |
| commit | aa9d9901e843135632b67af6b5641ab019a84d09 (patch) | |
| tree | bc791e87e26ef47ae9d929c81555f81b4d9464d7 | |
| parent | 957b8b15e1dc799c6f9b1c8dd42903f4c3f911f8 (diff) | |
SH-580 FIXED Crash in curl on exit
New defensive programming added this llerrs trigger. This is worth investigating but not at the top of our priority at the moment. Reverting to llinfos for now as has been done for non-Windows builds already.
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 6473b23e80..2b9bfff536 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -90,13 +90,8 @@ void check_curl_code(CURLcode code) if (code != CURLE_OK) { // linux appears to throw a curl error once per session for a bad initialization - // at a pretty random time (when enabling cookies). Making curl errors non-asserts - // for non-windows platforms for now. - Nyx - #if LL_WINDOWS - llerrs << "curl error detected: " << curl_easy_strerror(code) << llendl; - #else - llinfos << "curl error detected: " << curl_easy_strerror(code) << llendl; - #endif + // at a pretty random time (when enabling cookies). + llinfos << "curl error detected: " << curl_easy_strerror(code) << llendl; } } @@ -105,13 +100,8 @@ void check_curl_multi_code(CURLMcode code) if (code != CURLM_OK) { // linux appears to throw a curl error once per session for a bad initialization - // at a pretty random time (when enabling cookies). Making curl errors non-asserts - // for non-windows platforms for now. - Nyx - #if LL_WINDOWS - llerrs << "curl multi error detected: " << curl_multi_strerror(code) << llendl; - #else - llinfos << "curl multi error detected: " << curl_multi_strerror(code) << llendl; - #endif + // at a pretty random time (when enabling cookies). + llinfos << "curl multi error detected: " << curl_multi_strerror(code) << llendl; } } |