You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2007/10/27 01:25:45 UTC
svn commit: r588797 - /logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp
Author: carnold
Date: Fri Oct 26 16:25:41 2007
New Revision: 588797
URL: http://svn.apache.org/viewvc?rev=588797&view=rev
Log:
LOGCXX-177: SocketImpl::accept uses private APR function: apr_wait_for_io_or_timeout
Modified:
logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp?rev=588797&r1=588796&r2=588797&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/socketimpl.cpp Fri Oct 26 16:25:41 2007
@@ -163,16 +163,9 @@
/** Accepts a connection. */
void SocketImpl::accept(SocketImplPtr s)
{
- // If a timeout is set then wait at most for the specified timeout
- if (getSoTimeout() > 0) {
- apr_status_t status = apr_wait_for_io_or_timeout(NULL, (apr_socket_t*) socket, 0);
- if (status == APR_TIMEUP) {
- throw SocketTimeoutException();
- }
- if (status != APR_SUCCESS) {
- throw SocketException(status);
- }
- }
+ //
+ // Socket timeout is ignored. See bug LOGCXX-177.
+ //
// Accept new connection
apr_socket_t *clientSocket = 0;