Commit 6ef2fe04 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

merged 

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

STATUS

+0 −32
Original line number Diff line number Diff line
@@ -119,38 +119,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



  *) event: staging changes (incremental patches) to sync 2.4.x with trunk.

     Patch 1/4: Local variables scope (no functional changes)

     Patch 2/4: Optimizations and correctness (synchronization) which don't

                seem to have bitten us so far (no proven fix somehow)

     Patch 3/4: A wakeup fix regarding disabled listening sockets (corner case)

     Patch 4/4: Let the listener thread do its maintenance job on resources

                shortage

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

                  http://svn.apache.org/r1629576

       2.4.x 1/4: http://home.apache.org/~ylavic/patches/event-staging-1_on_4.patch

                  svn merge --record-only -c 1605328,1629576 .

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

                  http://svn.apache.org/r1703241

                  http://svn.apache.org/r1802535

                  http://svn.apache.org/r1819847

                  http://svn.apache.org/r1819848

                  http://svn.apache.org/r1819852

                  http://svn.apache.org/r1819853

       2.4.x 2/4: http://home.apache.org/~ylavic/patches/event-staging-2_on_4.patch

                  svn merge --record-only -c 1643279,1703241,1802535,1819847,1819848,1819852,1819853 .

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

                  http://svn.apache.org/r1821562

       2.4.x 3/4: http://home.apache.org/~ylavic/patches/event-staging-3_on_4.patch

                  svn merge --record-only -c 1819855,1821562 .

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

                  http://svn.apache.org/r1821561

                  http://svn.apache.org/r1821595

       2.4.x 4/4: http://home.apache.org/~ylavic/patches/event-staging-4_on_4-v2.patch

                  svn merge --record-only -c 1821558,1821561 .

     (2.4.x full: http://home.apache.org/~ylavic/patches/event-staging-full-v2.patch)

     +1: ylavic, jim, (if I did it right ;) ), icing





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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