Commit f02a071f authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r719357 from trunk: 

Fix MaxRequestsPerChild on the Event MPM.  It hasn't worked for 4 years.

* server/mpm/experimental/event/event.c
    (process_socket): Be consistent about our return value, returning 0
      means this connection is done, and that we can decrement requests_this_child.

Submitted by: pquerna
Reviewed by: jim


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

STATUS

+0 −6
Changes for STATUS: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -86,12 +86,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



    * Event MPM: Fix MaxRequestsPerChild

      Trunk version of patch:

        http://svn.apache.org/viewvc?view=rev&revision=719357

      Backport version for 2.2.x of patch:

         Trunk version of patch works

      +1: pquerna, rpluem, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

server/mpm/experimental/event/event.c

+2 −2
Changes for server/mpm/experimental/event/event.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static int process_socket(apr_pool_t * p, apr_socket_t * sock, 
        ap_lingering_close(c);

        apr_pool_clear(p);

        ap_push_pool(worker_queue_info, p);

        return 1;

        return 0;

    }

    else if (cs->state == CONN_STATE_CHECK_REQUEST_LINE_READABLE) {

        apr_status_t rc;
@@ -680,7 +680,7 @@ static int process_socket(apr_pool_t * p, apr_socket_t * sock, 
            AP_DEBUG_ASSERT(rc == APR_SUCCESS);

        }

    }

    return 0;

    return 1;

}



/* requests_this_child has gone to zero or below.  See if the admin coded