From 93146d3b408cc5ef097da8da8371a3d5173f83ee Mon Sep 17 00:00:00 2001 From: Mladen Turk Date: Mon, 2 Oct 2006 07:06:24 +0000 Subject: [PATCH] Cleanup alternate is_connected method. It works for sure on win32,linux and solaris. I do not have access to other platforms so can not verify it works on them. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@451896 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/proxy_util.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 66fe5bdff4..4b3f0659c3 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -2074,7 +2074,10 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, return OK; } -#if defined(WIN32) || defined(LINUX) +#if defined(WIN32) || defined(LINUX) || defined(SOLARIS2) +/* Tested platforms on which the alternative is_connected + * method works. + */ #define USE_ALTERNATE_IS_CONNECTED 1 #else #define USE_ALTERNATE_IS_CONNECTED 0 @@ -2101,9 +2104,9 @@ static int is_socket_connected(apr_socket_t *socket) do { rc = select((int)sock + 1, &fd, NULL, NULL, &tv); -#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__)) +#ifdef _MSC_VER errno = WSAGetLastError() - WSABASEERR; -#endif +#endif } while (rc == -1 && errno == EINTR); if (rc == 0) { @@ -2111,22 +2114,17 @@ static int is_socket_connected(apr_socket_t *socket) return 1; } else if (rc == 1) { -#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__)) +#ifdef _MSC_VER u_long nr; if (ioctlsocket(sock, FIONREAD, &nr) == 0) { - if (WSAGetLastError() == 0) - errno = 0; - else - errno = WSAGetLastError() - WSABASEERR; return nr == 0 ? 0 : 1; } - errno = WSAGetLastError() - WSABASEERR; #else int nr; if (ioctl(sock, FIONREAD, (void*)&nr) == 0) { return nr == 0 ? 0 : 1; } -#endif +#endif } return 0; } -- 2.40.0