- rebuild for fixed APR

This commit is contained in:
jorton 2007-09-02 13:57:10 +00:00
parent 94757f912d
commit 6590dbb985
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,22 @@
--- 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)

View File

@ -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 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh
%changelog
* Sun Sep 2 2007 Joe Orton <jorton@redhat.com> 2.2.4-10
- rebuild for fixed APR
* Wed Aug 22 2007 Joe Orton <jorton@redhat.com> 2.2.4-9
- rebuild for expat soname bump