Commit ad41907f authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1052236 13f79535-47bb-0310-9956-ffa450edef68
parent 9ea5ba89
Loading
Loading
Loading
Loading
+7 −7
Changes for STATUS: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -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 ]

@@ -192,13 +199,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     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