From: Nick Kew <niq@apache.org>
Date: Thu, 29 Nov 2007 14:36:43 +0000 (+0000)
Subject: Merge backport proposals and roll all-in-one 2.2.x patch
X-Git-Tag: 2.2.7~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b77ca8490697e4c6a4680ec970e55eb607ae64cd;p=thirdparty%2Fapache%2Fhttpd.git

Merge backport proposals and roll all-in-one 2.2.x patch
as suggested by jim and rpluem


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

diff --git a/STATUS b/STATUS
index ad4e6bccae7..d8e7b2d8c87 100644
--- a/STATUS
+++ b/STATUS
@@ -138,27 +138,23 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      they close stdout/stderr first and dup a then closed fd in stdout/stderr,
      leaving us without stdout/stderr in the child.
 
-   * core: backport ap_send_interim_response API
-     http://svn.apache.org/viewvc?view=rev&revision=582630
-     http://svn.apache.org/viewvc?view=rev&revision=582652
-     http://svn.apache.org/viewvc?view=rev&revision=588806
+   * mod_proxy_http: Correctly forward unexpected interim (HTTP 1xx) responses
+     incorporating ap_send_interim_response core API
+     PR 16518
+     trunk:
+       http://svn.apache.org/viewvc?view=rev&revision=582630
+       http://svn.apache.org/viewvc?view=rev&revision=582652
+       http://svn.apache.org/viewvc?view=rev&revision=582631
+       http://svn.apache.org/viewvc?view=rev&revision=588806
      +1: niq
-     niq says: It has been suggested the function should move to http_filters.
-               I'm OK with that if others feel happier that way.  The function
-               declaration presumably remains in http_protocol.h, so no API
-               change.
+     2.2.x:
+       http://people.apache.org/~niq/16508.patch
      rpluem says: Please merge this proposal with the one for PR 16518
                   below as both contain the same revision to backport (r588806)
                   and this backport here has conflicts because it misses
                   r582631. BTW I am +1 on a backport that contains all revisons
                   (582630, 582652, 582631, 588806).
-
-   * mod_proxy_http: Correctly forward unexpected interim (HTTP 1xx) responses
-     PR 16518
-     http://svn.apache.org/viewvc?view=rev&revision=582631
-     http://svn.apache.org/viewvc?view=rev&revision=588806
-     +1: niq, rpluem
-     -0: jim (how is this related to ap_send_interim_response above?)
+     niq says: done
 
    * server/protocol.c: Prevent 1-byte overflow on 8192 boundary in
      ap_vrprintf(). PR 43310