diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
| commit | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (patch) | |
| tree | f59f5e404f8417c8fea632592b7256c2f677b399 /indra/llmessage | |
| parent | bf55755262244c7c36df781d2e093b4109f6ecbf (diff) | |
| parent | 42a33b6c6250aca7e459f95cd13b0d0600cd6262 (diff) | |
merge changes for DRTVWR-276
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index 5831c3c1c1..227efdb07a 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -356,7 +356,8 @@ LLIOPipe::EStatus LLURLRequest::process_impl( } } - while(1) + bool keep_looping = true; + while(keep_looping) { CURLcode result; @@ -408,8 +409,9 @@ LLIOPipe::EStatus LLURLRequest::process_impl( case CURLE_FAILED_INIT: case CURLE_COULDNT_CONNECT: status = STATUS_NO_CONNECTION; + keep_looping = false; break; - default: + default: // CURLE_URL_MALFORMAT llwarns << "URLRequest Error: " << result << ", " << LLCurl::strerror(result) @@ -417,6 +419,7 @@ LLIOPipe::EStatus LLURLRequest::process_impl( << (mDetail->mURL.empty() ? "<EMPTY URL>" : mDetail->mURL) << llendl; status = STATUS_ERROR; + keep_looping = false; break; } } |