Commit 5be5ff60 authored by Chris Darroch's avatar Chris Darroch
Browse files

Propose backport of PRs 38621 and 38737.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@409736 13f79535-47bb-0310-9956-ffa450edef68
parent 0655872f
Loading
Loading
Loading
Loading
+17 −0
Changes for STATUS: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -128,3 +128,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          Trunk version works
      +1: rpluem

    * Worker and event MPMs: Fix for missing code in handling of
      GracefulShutdownTimeout.  PR 38621.
        Trunk version of patch:
          http://svn.apache.org/viewvc?view=rev&revision=377291
        2.2.x version of patch:
          http://issues.apache.org/bugzilla/attachment.cgi?id=18356
      +1: chrisd

    * Worker MPM: On graceless shutdown or restart, send signals to
      each worker thread to wake them up if they're polling on a
      Keep-Alive connection.  PR 38737.
        Trunk version of patch:
          http://svn.apache.org/viewvc?view=rev&revision=409715
        2.2.x version of patch:
          http://issues.apache.org/bugzilla/attachment.cgi?id=18355
      +1: chrisd