Commit a18bab70 authored by Eric Covener's avatar Eric Covener
Browse files

Merge r1684057 from trunk: 

mpm_event: Follow up to r1664071: quiet compiler (spurious) warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686399 13f79535-47bb-0310-9956-ffa450edef68
parent be498f7c

STATUS

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

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



  *) event: quiet compiler warning (spurious, "'last' may be used

            uninitialized", though actually it won't).

     trunk patch: http://svn.apache.org/r1684057

     2.4.x patch: trunk works (modulo CHANGES)

     +1: ylavic, jailletc36, ocovener



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

server/mpm/event/event.c

+1 −1
Changes for server/mpm/event/event.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1447,7 +1447,7 @@ static void process_timeout_queue(struct timeout_queue *q, 
    APR_RING_INIT(&trash, event_conn_state_t, timeout_list);

    for (qp = q; qp; qp = qp->next) {

        count = 0;

        cs = first = APR_RING_FIRST(&qp->head);

        cs = first = last = APR_RING_FIRST(&qp->head);

        while (cs != APR_RING_SENTINEL(&qp->head, event_conn_state_t,

                                       timeout_list)

               /* Trash the entry if: