From: Graham Leggett <minfrin@apache.org>
Date: Tue, 10 Oct 2006 21:58:29 +0000 (+0000)
Subject: Propose some backports.
X-Git-Tag: 2.2.4~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f640d23fab2a522c28e622c0e4acebe637e6b02b;p=thirdparty%2Fapache%2Fhttpd.git

Propose some backports.


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

diff --git a/STATUS b/STATUS
index 43e215ff697..d1369e2eccc 100644
--- a/STATUS
+++ b/STATUS
@@ -238,6 +238,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Trunk: http://svn.apache.org/viewvc?view=rev&revision=450089
       +1: minfrin
 
+    * sendfile_nonblocking() takes the _brigade_ as an argument, gets 
+      the first bucket from the brigade, finds it not to be a FILE
+      bucket and barfs. The fix is to pass a bucket rather than a brigade.
+      Trunk: http://svn.apache.org/viewvc?view=rev&revision=462580
+      +1: minfrin
+
+    * mod_cache: Eliminate a bogus error in the log when a filter returns
+      AP_FILTER_ERROR.
+      Trunk: http://svn.apache.org/viewvc?view=rev&rev=450453
+      +1: minfrin
+
     * core: Orphaned piped logger process after graceful restart
         PR: 40651
       Trunk version of patch: