Commit 36b5b686 authored by Mladen Turk's avatar Mladen Turk
Browse files

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
parent f4bf8c25

modules/proxy/proxy_util.c

+6 −8
Changes for modules/proxy/proxy_util.c: 6 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -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,7 +2104,7 @@ 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

    } while (rc == -1 && errno == EINTR);
@@ -2111,16 +2114,11 @@ 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) {