From: Jim Jagielski <jim@apache.org>
Date: Thu, 9 Aug 2007 15:30:58 +0000 (+0000)
Subject: Promote patch
X-Git-Tag: 2.2.5~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=010bfb334a5127d3e99694314ffb861b8babb7ba;p=thirdparty%2Fapache%2Fhttpd.git

Promote patch


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

diff --git a/STATUS b/STATUS
index 0034d054937..7c33ad2c9b8 100644
--- a/STATUS
+++ b/STATUS
@@ -78,7 +78,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
+    * mod_deflate: fix content_encoding detection from different
+      sources in inflate_out filter.
+      PR: 42993
+      http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_deflate.c?r1=563230&r2=563803
+      +1: niq, rpluem, jim
+      
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * ApacheMonitor: Fix Windows Vista detection.
@@ -310,12 +315,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewvc?view=rev&revision=562236
       +1: niq
 
-    * mod_deflate: fix content_encoding detection from different
-      sources in inflate_out filter.
-      PR: 42993
-      http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_deflate.c?r1=563230&r2=563803
-      +1: niq, rpluem, jim
-      
     * httxt2dbm.exe: add to the Windows build
       PR: 42549
       http://svn.apache.org/viewvc/httpd/httpd/trunk/support/httxt2dbm.dsp?view=log&pathrev=563636