aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage/lliosocket.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llmessage/lliosocket.cpp')
-rw-r--r--linden/indra/llmessage/lliosocket.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index 8bc347c..fdb4a89 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -421,6 +421,7 @@ LLIOPipe::EStatus LLIOSocketWriter::process_impl(
421 PUMP_DEBUG; 421 PUMP_DEBUG;
422 apr_size_t len; 422 apr_size_t len;
423 bool done = false; 423 bool done = false;
424 apr_status_t status = APR_SUCCESS;
424 while(it != end) 425 while(it != end)
425 { 426 {
426 427
@@ -428,9 +429,8 @@ LLIOPipe::EStatus LLIOSocketWriter::process_impl(
428 if((*it).isOnChannel(channels.in())) 429 if((*it).isOnChannel(channels.in()))
429 { 430 {
430 PUMP_DEBUG; 431 PUMP_DEBUG;
431 // *FIX: check return code - sockets will fail (broken, etc.)
432 len = (apr_size_t)segment.size(); 432 len = (apr_size_t)segment.size();
433 apr_status_t status = apr_socket_send( 433 status = apr_socket_send(
434 mDestination->getSocket(), 434 mDestination->getSocket(),
435 (const char*)segment.data(), 435 (const char*)segment.data(),
436 &len); 436 &len);
@@ -438,12 +438,12 @@ LLIOPipe::EStatus LLIOSocketWriter::process_impl(
438 // completed immediately' error from apr_socket_send. In this 438 // completed immediately' error from apr_socket_send. In this
439 // case we break and the data will be sent the next time the chain 439 // case we break and the data will be sent the next time the chain
440 // is pumped. 440 // is pumped.
441#if LL_WINDOWS 441 if(APR_STATUS_IS_EAGAIN(status))
442 if (status == 730035) 442 {
443 ll_apr_warn_status(status);
443 break; 444 break;
444#else 445 }
445 (void) status; 446
446#endif
447 mLastWritten = segment.data() + len - 1; 447 mLastWritten = segment.data() + len - 1;
448 448
449 PUMP_DEBUG; 449 PUMP_DEBUG;