From 28ca3a6fdd8a5a5a291e20094334889af5dde664 Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Thu, 23 Dec 2010 12:09:40 +0000 Subject: [PATCH] * Promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1052236 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/STATUS b/STATUS index 585436742db..28c76196975 100644 --- a/STATUS +++ b/STATUS @@ -97,6 +97,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.2.x patch: trunk patch works +1: minfrin, jim, covener + * mod_mem_cache: add a debug msg when a streaming response exceeds + MCacheMaxStreamingBuffer, since mod_cache will follow up with a scary + 'memory allocation failed' debug message. PR 49604 + Trunk patch: n/a mod_mem_cache not in trunk + 2.2.x: http://people.apache.org/~covener/patches/httpd-2.2.x-memcache_streaming_debug-2.diff + +1 covener, poirier, rpluem + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -185,20 +192,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1031430 2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-autoindex_merge.diff +1 covener, rpluem - + * mod_userdir: support merge of "userdir disabled" or "userdir public_html" when userdir directives appear in vhost context. PR 44076 Trunk patch: http://svn.apache.org/viewvc?rev=1042090&view=rev 2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-userdir_merge.diff +1 covener, rpluem - * mod_mem_cache: add a debug msg when a streaming response exceeds - MCacheMaxStreamingBuffer, since mod_cache will follow up with a scary - 'memory allocation failed' debug message. PR 49604 - Trunk patch: n/a mod_mem_cache not in trunk - 2.2.x: http://people.apache.org/~covener/patches/httpd-2.2.x-memcache_streaming_debug-2.diff - +1 covener, poirier, rpluem - * core: honor "AcceptPathInfo OFF" for internal redirects, such as those generated by mod_rewrite in per-dir context. This would be left floating around in the request_rec with a pcalloc'ed value, so the core fixup -- 2.47.2