From: Jeff Trawick <trawick@apache.org>
Date: Tue, 14 Aug 2012 11:25:41 +0000 (+0000)
Subject: normal vote/promote stuff
X-Git-Tag: 2.4.3~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=658ca8a1201e0d301fa6b298d2a347b4ecf63d37;p=apache

normal vote/promote stuff


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

diff --git a/STATUS b/STATUS
index 636cf20b50..e137d4b5cb 100644
--- a/STATUS
+++ b/STATUS
@@ -88,6 +88,10 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_cache: Set content type in case we return stale content.
+     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1361153
+     2.4.x patch: trunk patch works
+     +1: rjung, humbedooh, trawick (needs CHANGES entry)
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -207,11 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: rjung, trawick
 
-   * mod_cache: Set content type in case we return stale content.
-     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1361153
-     2.4.x patch: trunk patch works
-     +1: rjung, humbedooh
-
    * mpm_winnt: initialize the protocol field when manufacturing an apr socket
      lest accidential autodata contents leak into the apr_socket_t.
      (this doesn't address any known problem symptom)
@@ -224,7 +223,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      PR: 52893
      trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1361801
      2.4.x patch: trunk patch works, except for mod_policy (ignore)
-     +1: rjung
+     +1: rjung, trawick
 
    * core: make ap_parse_form_data less strict when checking for a correct 
            Content-Type header when parsing POST, or we risk losing valid