Commit fb3a9b58 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

Approve two backports


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488516 13f79535-47bb-0310-9956-ffa450edef68
parent 5d611b9b
Loading
Loading
Loading
Loading
+32 −32
Changes for STATUS: 32 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -78,36 +78,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
  [ start all new proposals below, under PATCHES PROPOSED. ]

PATCHES PROPOSED TO BACKPORT FROM TRUNK:

    * mpm_winnt: Fix return values from wait_for_many_objects.
      Note - this is required to avoid hangups of socket #64, #128
      as Microsoft set aside 64 reserved values.
      Trunk version of patch:
        http://svn.apache.org/viewvc?view=rev&revision=428029
      2.2.x version of patch:
        Trunk version works
      +1: mturk, wrowe

    * Bundled PCRE: backport r381783 from trunk
      Fix brokenness on certain platforms when building with -DDEBUG.
      http://svn.apache.org/viewvc?view=rev&revision=381783
      +1 sctemme, fielding, pquerna, jerenkrantz
      -1 niq: Why are we hacking a third-party package as bundled,
              rather than upstream?  This has potential for chaos
              for modules (and we have a history of PCRE trouble)
              as well as a maintenance nightmare!
      jerenkrantz: I don't believe that's a valid reason to block this.
                   We're bundling PCRE for the duration of the 2.2.x series,
                   but we can re-evaluate for future major/minor revs.
      wrowe: nak niq, ack je; this is a silly debate, fix, push fixes upstream
             and adopt a newer PCRE at trunk/.

    * PKCS#7: backport PCKS#7 patches from trunk.
      +1 ben
      jerenkrantz: What's the revision number to backport?
      wrowe asks: ditto jerenkrantz

    * mod_deflate: Rework inflate output and deflate output filter to fix
      several issues: Incorrect handling of flush buckets, potential memory
      leaks, excessive memory usage in inflate output filter for large
@@ -153,7 +123,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        deflate output filter.
        Alternately, substitute mod_deflate.c of trunk (at r483597) which maps
        to the same result as the net patches.
      +1: rpluem, niq
      +1: rpluem, niq, jerenkrantz

    * Allow htcacheclean and httxt2dbm to link apr/apr-util statically
      like the older support programs.
@@ -161,7 +131,37 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://svn.apache.org/viewvc?view=rev&revision=441796
      2.2.x version of patch:
        http://mail-archives.apache.org/mod_mbox//httpd-dev/200609.mbox/%3c1404e5910609091218p84f4d2flc1000764b4966727@mail.gmail.com%3e
      +1: trawick, wrowe
      +1: trawick, wrowe, jerenkrantz

PATCHES PROPOSED TO BACKPORT FROM TRUNK:

    * mpm_winnt: Fix return values from wait_for_many_objects.
      Note - this is required to avoid hangups of socket #64, #128
      as Microsoft set aside 64 reserved values.
      Trunk version of patch:
        http://svn.apache.org/viewvc?view=rev&revision=428029
      2.2.x version of patch:
        Trunk version works
      +1: mturk, wrowe

    * Bundled PCRE: backport r381783 from trunk
      Fix brokenness on certain platforms when building with -DDEBUG.
      http://svn.apache.org/viewvc?view=rev&revision=381783
      +1 sctemme, fielding, pquerna, jerenkrantz
      -1 niq: Why are we hacking a third-party package as bundled,
              rather than upstream?  This has potential for chaos
              for modules (and we have a history of PCRE trouble)
              as well as a maintenance nightmare!
      jerenkrantz: I don't believe that's a valid reason to block this.
                   We're bundling PCRE for the duration of the 2.2.x series,
                   but we can re-evaluate for future major/minor revs.
      wrowe: nak niq, ack je; this is a silly debate, fix, push fixes upstream
             and adopt a newer PCRE at trunk/.

    * PKCS#7: backport PCKS#7 patches from trunk.
      +1 ben
      jerenkrantz: What's the revision number to backport?
      wrowe asks: ditto jerenkrantz

    * mod_proxy: Support variable interpolation in reverse proxy configuration
      http://svn.apache.org/viewvc?view=rev&revision=421686  (code)