VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-20 16:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove alternate is_socket_connected detection.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@473276 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mladen Turk
2006-11-10 09:12:57 +00:00
parent c668541e8a
commit e22c26b53b
1 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
modules/proxy/proxy_util.c
View File

@ -2077,64 +2077,6 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
return OK;
}
#if defined(WIN32) || defined(LINUX) || defined(SOLARIS2)
/* Tested platforms on which the alternative is_connected
* method works.
*/
#ifndef _MSC_VER
#include <sys/ioctl.h>
#endif
#define USE_ALTERNATE_IS_CONNECTED 1
#else
#define USE_ALTERNATE_IS_CONNECTED 0
#endif
#if USE_ALTERNATE_IS_CONNECTED
static int is_socket_connected(apr_socket_t *socket)
{
fd_set fd;
struct timeval tv;
int rc;
apr_os_sock_t sock;
if (apr_os_sock_get(&sock, socket) != APR_SUCCESS)
return 0;
FD_ZERO(&fd);
FD_SET(sock, &fd);
/* Wait one microsecond */
tv.tv_sec = 0;
tv.tv_usec = 1;
do {
rc = select((int)sock + 1, &fd, NULL, NULL, &tv);
#ifdef _MSC_VER
errno = WSAGetLastError() - WSABASEERR;
#endif
} while (rc == -1 && errno == EINTR);
if (rc == 0) {
/* If we get a timeout, then we are still connected */
return 1;
}
else if (rc == 1) {
#ifdef _MSC_VER
u_long nr;
if (ioctlsocket(sock, FIONREAD, &nr) == 0) {
return nr == 0 ? 0 : 1;
}
#else
int nr;
if (ioctl(sock, FIONREAD, (void*)&nr) == 0) {
return nr == 0 ? 0 : 1;
}
#endif
}
return 0;
}
#else
static int is_socket_connected(apr_socket_t *sock)
{
@ -2158,7 +2100,6 @@ static int is_socket_connected(apr_socket_t *sock)
return 1;
}
}
#endif /* USE_ALTERNATE_IS_CONNECTED */
PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
proxy_conn_rec *conn,