diff options
| author | jorton <jorton@fedoraproject.org> | 2007-09-02 13:57:10 +0000 |
|---|---|---|
| committer | jorton <jorton@fedoraproject.org> | 2007-09-02 13:57:10 +0000 |
| commit | 6590dbb9858735568645e3e10970a7f604339ddf (patch) | |
| tree | d76f199252c7db5030eb4331a513689cafc48f0b | |
| parent | 94757f912d66a635cee2214d6fc04778aa25ed0a (diff) | |
| download | httpd-6590dbb9858735568645e3e10970a7f604339ddf.tar.gz httpd-6590dbb9858735568645e3e10970a7f604339ddf.tar.xz httpd-6590dbb9858735568645e3e10970a7f604339ddf.zip | |
- rebuild for fixed APRhttpd-2_2_4-10
| -rw-r--r-- | httpd-2.2.4-oldflush.patch | 22 | ||||
| -rw-r--r-- | httpd.spec | 5 |
2 files changed, 26 insertions, 1 deletions
diff --git a/httpd-2.2.4-oldflush.patch b/httpd-2.2.4-oldflush.patch new file mode 100644 index 0000000..69b8392 --- /dev/null +++ b/httpd-2.2.4-oldflush.patch @@ -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) @@ -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 |