From 6105c20dd5407ad28e7ff857ab58cdf4f21c1528 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 8 Dec 2006 15:30:45 +0000 Subject: [PATCH] promote as accepted git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484639 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/STATUS b/STATUS index 82527db587f..148ae1bd89b 100644 --- a/STATUS +++ b/STATUS @@ -96,8 +96,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: wrowe adds; keeping the old idents for backporting would have made this alot easier for review - mind \x09's please. -PATCHES PROPOSED TO BACKPORT FROM TRUNK: - * mod_mem_cache: Convert mod_mem_cache to use APR memory pool functions by creating a root pool for object persistence across requests. This also eliminates the need for custom serialization code. @@ -107,6 +105,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://people.apache.org/~jim/patches/mod_mem_cache-apr-patch.txt +1: jim: 2.2 patch to address trunk patch conflicts +PATCHES PROPOSED TO BACKPORT FROM TRUNK: + * mpm_winnt: Fix return values from wait_for_many_objects. Trunk version of patch: http://svn.apache.org/viewvc?view=rev&revision=428029 -- 2.47.2