From: Nick Kew <niq@apache.org>
Date: Thu, 1 Nov 2007 00:06:46 +0000 (+0000)
Subject: Add combined patch to fix Jim's objections.
X-Git-Tag: 2.2.7~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6f802c8527ed05e243cf4300a92e16a3adf3e43;p=thirdparty%2Fapache%2Fhttpd.git

Add combined patch to fix Jim's objections.


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

diff --git a/STATUS b/STATUS
index d21272d16fb..cbcd8b155a7 100644
--- a/STATUS
+++ b/STATUS
@@ -167,6 +167,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      PR 42592
      http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?r1=582655&r2=583803&pathrev=583803
      2.2.x patch: http://people.apache.org/~niq/42592.patch
+     2.2.x composite patch: this together with PR41798 patch
+        http://people.apache.org/~niq/41798+42592.patch
      +1: niq, rpluem
      -1: jim: Comment is wrong if not bundled with "nocanon" option
      niq: On the contrary, comment is accurate without the noncanon option.
@@ -201,6 +203,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         mod_proxy.c patch at http://people.apache.org/~niq/41798.patch
         mod_proxy_http.c patch: trunk works after applying PR#42592 patch
         Other files: trunk patch works.
+     2.2.x composite patch: this together with PR42592 patch
+        http://people.apache.org/~niq/41798+42592.patch
      +1: niq
      -1: jim: patch should be self-contained. If a mix and match of
               files, then please create a distinct 2.2 patch.