From: Jeff Trawick <trawick@apache.org>
Date: Sat, 17 May 2014 11:54:38 +0000 (+0000)
Subject: vote, propose
X-Git-Tag: 2.4.10~225
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f1233ebfbc4ecbff0524acf0a784b8712f11154;p=apache

vote, propose


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

diff --git a/STATUS b/STATUS
index 00d8eec1ac..69813d08c2 100644
--- a/STATUS
+++ b/STATUS
@@ -199,7 +199,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                          PR 55320.
      trunk patch: http://svn.apache.org/r1594625
      2.4.x patch: trunk patch works modulo CHANGES
-     +1: ylavic
+     +1: ylavic, trawick
 
    * mod_cache: Preserve non-cacheable headers forwarded from an origin 304
                 response. PR 55547.
@@ -214,13 +214,24 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      conditions used to revalidate the stale entry.  [Yann Ylavic].
      trunk patch: http://svn.apache.org/r1591143
      2.4.x patch: trunk works (modulo CHANGES)
-     +1: minfrin
+     +1: minfrin, trawick
 
    * mod_socache_shmcb: Correct counting of expirations for status display.
      Expirations happening during retrieval were not counted.
      trunk patch: http://svn.apache.org/r1595426
      2.4.x patch: trunk works (modulo CHANGES)
-     +1: rjung
+     +1: rjung, trawick
+
+   * minor proxy_util cleanups:
+     . get rid of unnecessary block scope
+     . Clarify an existing requirement of the server_portstr parameter
+       to ap_proxy_determine_connection(): it must be a buffer of at
+       least one byte in size.  (And don't bother with using strcpy in
+       order to zap a string.)
+     trunk patches: http://svn.apache.org/viewvc?view=revision&revision=r1592511
+                    http://svn.apache.org/viewvc?view=revision&revision=r1592514
+     2.4.x patches: trunk patches work
+     +1: trawick
 
 OTHER PROPOSALS