From: Nick Kew <niq@apache.org>
Date: Fri, 28 Nov 2008 13:08:37 +0000 (+0000)
Subject: Major changes that differ from trunk are just what our ABI-compatibility
X-Git-Tag: 2.2.11~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05ab72fd9991df6a8db5bf035c946f42aa068e63;p=thirdparty%2Fapache%2Fhttpd.git

Major changes that differ from trunk are just what our ABI-compatibility
promise needs.  Yeah, right.


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

diff --git a/STATUS b/STATUS
index 417082eb3be..0e5e8469c86 100644
--- a/STATUS
+++ b/STATUS
@@ -86,6 +86,10 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
   * srclib/pcre and vendor/pcre
     http://www.vuxml.org/freebsd/pkg-pcre.html
 
@@ -100,7 +104,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
             upgrading -- the best policy IMO is to follow them, 5.x is not going
             to be maintained.
     +0
-    -1
+    -1: niq: since pcre just got deleted from trunk, this isn't even
+             a backport being proposed.  It's an untested change over
+             their major versions, when we promise binary-compatibility!
+             If we're in the business of untested changes, then make
+             the sane one and just stop bundling it altogether.
 
     pgollucci volunteers
 
@@ -114,9 +122,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     +0
     -1: pgollucci
     
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
    * mod_ssl: Add server name indication (RFC 4366) support (PR 34607).
       Trunk version of patches:
          http://svn.apache.org/viewvc?view=rev&revision=606190