Commit ffa1e88c authored by Jeff Trawick's avatar Jeff Trawick
Browse files

WinNT MPM: Fix INVALID_SOCKET bogosity 

The related code and a lot more was removed from trunk in r730828.

This doesn't address any reported problem symptom.

Submitted by: trawick
Reviewed by: druggeri, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1373349 13f79535-47bb-0310-9956-ffa450edef68
parent 6d1552e4

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -124,12 +124,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.2.x patch: trunk patch works

     +1: trawick, druggeri, rpluem



   * WinNT MPM: INVALID_SOCKET bogosity

     trunk/2.4.x patch: fixed long ago with a rewrite of the affected code

                        (axed in 730828, reimplemented later)

     2.2.x patch: http://people.apache.org/~trawick/winnt-2.2.x-INVALID_SOCKET.txt

     +1: trawick, druggeri, rpluem



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

server/mpm/winnt/child.c

+2 −2
Original line number Diff line number Diff line
@@ -401,9 +401,9 @@ static unsigned int __stdcall win9x_accept(void * dummy) 
        do {

            clen = sizeof(sa_client);

            csd = accept(nsd, (struct sockaddr *) &sa_client, &clen);

        } while (csd < 0 && APR_STATUS_IS_EINTR(apr_get_netos_error()));

        } while (csd == INVALID_SOCKET && APR_STATUS_IS_EINTR(apr_get_netos_error()));



        if (csd < 0) {

        if (csd == INVALID_SOCKET) {

            if (APR_STATUS_IS_ECONNABORTED(apr_get_netos_error())) {

                ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_netos_error(), ap_server_conf,

                            "accept: (client socket)");