rpms/httpd/devel httpd-2.2.4-oldflush.patch, NONE, 1.1 httpd.spec, 1.113, 1.114

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14182

Modified Files:
	httpd.spec 
Added Files:
	httpd-2.2.4-oldflush.patch 
Log Message:
* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.2.4-10
- rebuild for fixed APR


httpd-2.2.4-oldflush.patch:

--- NEW FILE httpd-2.2.4-oldflush.patch ---
--- httpd-2.2.4/server/util_filter.c.oldflush
+++ httpd-2.2.4/server/util_filter.c
@@ -578,8 +578,18 @@ AP_DECLARE_NONSTD(apr_status_t) ap_filte
                                                 void *ctx)
 {
     ap_filter_t *f = ctx;
+    apr_status_t rv;
 
-    return ap_pass_brigade(f, bb);
+    rv = ap_pass_brigade(f, bb);
+
+    /* apr_brigade_write* require that the flush function ensures that
+     * the brigade is empty upon return; otherwise the brigade may be
+     * left with a transient bucket whose contents have fallen out of
+     * scope.  Call cleanup here unconditionally to avoid the issue in
+     * all cases. */
+    apr_brigade_cleanup(bb);
+
+    return rv;
 }
 
 AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb)


Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- httpd.spec	22 Aug 2007 19:03:11 -0000	1.113
+++ httpd.spec	2 Sep 2007 13:57:10 -0000	1.114
@@ -6,7 +6,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.4
-Release: 9
+Release: 10
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -474,6 +474,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Sun Sep  2 2007 Joe Orton <jorton at redhat.com> 2.2.4-10
+- rebuild for fixed APR
+
 * Wed Aug 22 2007 Joe Orton <jorton at redhat.com> 2.2.4-9
 - rebuild for expat soname bump