From: Jan Kaluža <jkaluza@apache.org>
Date: Thu, 29 May 2014 07:59:36 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.2.28~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5480de614c3325bde2a71df67e1004f79bfcb627;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 2e2c979049e..05fbefdf47b 100644
--- a/STATUS
+++ b/STATUS
@@ -120,6 +120,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~covener/patches/httpd-2.2.x-rewrite-sessioncookie.diff
      +1 covener, ylavic, rpluem
 
+   * mod_cache, mod_disk_cache: Try to use the key of a possible open but
+     stale cache entry if there is one. This fixes problem when two different
+     cache locks have been created for single stale cache entry leading to two
+     requests sent to backend.
+     Remove useless apr_file_remove() before renaming the cache entry in
+     mod_disk_cache. This fixes small time-frame during which stale cache
+     entry can be seen as not-cached.
+     PR 50317
+     2.2.x patch: http://people.apache.org/~jkaluza/patches/httpd-2.2.x-thundering-herd.patch
+     +1: ylavic, rpluem, jkaluza
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -135,17 +146,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      rpluem says: +1 if you add the MMN bump
      ylavic: MMN bump in patch #3
 
-   * mod_cache, mod_disk_cache: Try to use the key of a possible open but
-     stale cache entry if there is one. This fixes problem when two different
-     cache locks have been created for single stale cache entry leading to two
-     requests sent to backend.
-     Remove useless apr_file_remove() before renaming the cache entry in
-     mod_disk_cache. This fixes small time-frame during which stale cache
-     entry can be seen as not-cached.
-     PR 50317
-     2.2.x patch: http://people.apache.org/~jkaluza/patches/httpd-2.2.x-thundering-herd.patch
-     +1: ylavic, rpluem
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * mod_cache: Realign the cache_quick_handler() to behave identically