From: Nick Kew <niq@apache.org>
Date: Tue, 9 Oct 2007 01:47:43 +0000 (+0000)
Subject: Deal with Jim's objections to backports
X-Git-Tag: 2.2.7~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f09fd6984bbdf5096046535575ea2feb4c6f3f13;p=thirdparty%2Fapache%2Fhttpd.git

Deal with Jim's objections to backports


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

diff --git a/STATUS b/STATUS
index c7e8a1a3360..82609e65ad7 100644
--- a/STATUS
+++ b/STATUS
@@ -209,21 +209,25 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
    * mod_proxy_http: Correctly parse all Connection headers in proxy.
      PR 43509
-     http://svn.apache.org/viewvc?view=rev&revision=580457
+     trunk: http://svn.apache.org/viewvc?view=rev&revision=580457
+     2.2.x: http://people.apache.org/~niq/43509.patch
      +1: niq, rpluem
      niq: changed the name.  Resisted temptation to use "pooltabletime".
      rpluem says: Revision of name change is r581030.
      -1: jim. r580457 and r581030 conflict. Likely because of
               r580782
+     niq: separate 2.2.x patch fixes jim's objection
 
    * mod_proxy_http: Remove Warning headers with wrong date
      PR 16138
-     http://svn.apache.org/viewvc?view=rev&revision=580782
+     trunk: http://svn.apache.org/viewvc?view=rev&revision=580782
+     2.2.x: http://people.apache.org/~niq/16138.patch
      +1: niq, rpluem
      niq: changed the name.  Resisted temptation to use "pooltabletime".
      rpluem says: Revision of name change is r581030.
      -1: jim nasty conflict with r580457... backports should be
          self contained
+     niq: separate 2.2.x patch fixes jim's objection
 
    * mpm_winnt: Fix null pointer dereference
      PR 42572