From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 19 Dec 2006 19:38:48 +0000 (+0000)
Subject: Votes and Notes; the first four I would like to see applied before
X-Git-Tag: 2.2.4~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77e8da2d8d3c8b0df4e9e1249fb94dbb892e1fdd;p=thirdparty%2Fapache%2Fhttpd.git

Votes and Notes; the first four I would like to see applied before
tagging 1.2.4; add a better patch for the winnt mpm wait patch
that makes this reviewable (sometimes -U3 just isn't enough context.)


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

diff --git a/STATUS b/STATUS
index 28764ed7ea6..332132564f6 100644
--- a/STATUS
+++ b/STATUS
@@ -123,7 +123,7 @@ PATCHES ACCEPTED 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, jerenkrantz
+      +1: rpluem, niq, jerenkrantz, wrowe
 
     * Allow htcacheclean and httxt2dbm to link apr/apr-util statically
       like the older support programs.
@@ -133,6 +133,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         http://mail-archives.apache.org/mod_mbox//httpd-dev/200609.mbox/%3c1404e5910609091218p84f4d2flc1000764b4966727@mail.gmail.com%3e
       +1: trawick, wrowe, jerenkrantz
 
+   * mod_proxy: Log unlock errors (as we do with locking errors).
+     Add additional clarification on where the error occurred.
+     Trunk version of patch:
+       http://svn.apache.org/viewvc?view=rev&revision=484792
+       http://svn.apache.org/viewvc?view=rev&revision=484787
+       http://svn.apache.org/viewvc?view=rev&revision=484978
+     2.2.x version of patch:
+       For r484787, see: http://people.apache.org/~jim/patches/lock.txt
+       otherwise, trunk version works.
+     +1: jim, rpluem, wrowe
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Fix return values from wait_for_many_objects.
@@ -142,6 +153,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://svn.apache.org/viewvc?view=rev&revision=428029
       2.2.x version of patch:
         Trunk version works
+        http://people.apache.org/~wrowe/mpm_winnt_waits.patch
+        is easier to read (-U8)
       +1: mturk, wrowe
 
     * Bundled PCRE: backport r381783 from trunk
@@ -217,17 +230,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          ever start using it. So we keep the framework in
          that case. Make trunk backports easier.
 
-   * mod_proxy: Log unlock errors (as we do with locking errors).
-     Add additional clarification on where the error occurred.
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=484792
-       http://svn.apache.org/viewvc?view=rev&revision=484787
-       http://svn.apache.org/viewvc?view=rev&revision=484978
-     2.2.x version of patch:
-       For r484787, see: http://people.apache.org/~jim/patches/lock.txt
-       otherwise, trunk version works.
-     +1: jim, rpluem
-
    * core: PR#37680
      Fix NONBLOCK status of listening sockets on restart/graceful
      http://svn.apache.org/viewvc?view=rev&revision=487901