From 5f777d9d7cd8550081a6575076ba6c7405e8278d Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Thu, 17 May 2007 23:14:49 +0000 Subject: Vote on a backport. Move two that are approved to the right section. (rpluem and fielding both posted on dev@httpd that they are okay with trunk version going in instead.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539161 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/STATUS b/STATUS index 891e771f04..4c519ee499 100644 --- a/STATUS +++ b/STATUS @@ -114,6 +114,29 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: (Applies cleanly) +1: jerenkrantz, fielding, rpluem + * mod_proxy: Print the correct error message for erroneous configured + ProxyPass directives + PR: 40439 + Trunk version of patch: + http://svn.apache.org/viewvc?view=rev&revision=441947 + 2.2.x version of patch: + Trunk version works + +1: rpluem, jim, jerenkrantz + + * mod_cache: Allow query string requests with max-age to be cached. + Trunk version of patch: + http://svn.apache.org/viewvc?view=rev&revision=538807 + 2.2.x version of patch: + Trunk version works + +1: jerenkrantz, fielding, rpluem + rpluem asks: Why not backporting the adjusted error message :-)? + Otherwise +1. + jerenkrantz: As I replied, I don't care either way. I was just trying to + minimize the delta against 2.2.x. + rpluem : Now that CacheIgnoreQueryString has been backported r538807 + applies cleanly to 2.2.x. So I assume it is ok to use + r538807 instead of max-age-2.2.x.patch. + PATCHES PROPOSED TO BACKPORT FROM TRUNK: * ApacheMonitor: Fix Windows Vista detection. @@ -177,15 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: PR 42327 seems like a duplicate of 41302 (both would be closed by r503931), and r496831 would close PR 39985 as well. - * mod_proxy: Print the correct error message for erroneous configured - ProxyPass directives - PR: 40439 - Trunk version of patch: - http://svn.apache.org/viewvc?view=rev&revision=441947 - 2.2.x version of patch: - Trunk version works - +1: rpluem, jim - * mod_dbd: Rename functions and variables for consistency, and move some functions around for readability, prior to making functional changes for PRs 39985, 41302, and other issues. @@ -265,21 +279,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://people.apache.org/~chrisd/patches/mod_dbd_pools_groups/mod_dbd-4groups-2.2.x.patch +1: chrisd - * mod_cache: Allow query string requests with max-age to be cached. - Trunk version of patch: - http://svn.apache.org/viewvc?view=rev&revision=538807 - 2.2.x version of patch: - http://people.apache.org/~jerenkrantz/max-age-2.2.x.patch - (Trivially conflicts with CacheIgnoreQueryString above.) - +1: jerenkrantz, fielding - rpluem asks: Why not backporting the adjusted error message :-)? - Otherwise +1. - jerenkrantz: As I replied, I don't care either way. I was just trying to - minimize the delta against 2.2.x. - rpluem : Now that CacheIgnoreQueryString has been backported r538807 - applies cleanly to 2.2.x. So I assume it is ok to use - r538807 instead of max-age-2.2.x.patch. - * mod_cache: Let Cache-Control max-age set the expiration date. Trunk version of patch: http://svn.apache.org/viewvc?view=rev&revision=539063 -- cgit v1.2.1