[httpd] mod_ext_filter: fix error_log warnings

[jorton]

commit 27e50f5fa54f67a65f7b19bdebb8d7102276dab1
Author: Joe Orton <jorton at redhat.com>
Date:   Thu Jul 5 18:11:14 2012 +0100

    mod_ext_filter: fix error_log warnings

 httpd-2.4.2-r1357685.patch |   38 ++++++++++++++++++++++++++++++++++++++
 httpd.spec                 |    7 ++++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/httpd-2.4.2-r1357685.patch b/httpd-2.4.2-r1357685.patch
new file mode 100644
index 0000000..189a089
--- /dev/null
+++ b/httpd-2.4.2-r1357685.patch
@@ -0,0 +1,38 @@
+# ./pullrev.sh 1357685
+
+http://svn.apache.org/viewvc?view=revision&revision=1357685
+
+--- httpd-2.4.2/modules/filters/mod_ext_filter.c
++++ httpd-2.4.2/modules/filters/mod_ext_filter.c
+@@ -66,7 +66,7 @@
+     apr_procattr_t *procattr;
+     ef_dir_t *dc;
+     ef_filter_t *filter;
+-    int noop;
++    int noop, hit_eos;
+ #if APR_FILES_AS_SOCKETS
+     apr_pollset_t *pollset;
+ #endif
+@@ -827,6 +827,7 @@
+     if (eos) {
+         b = apr_bucket_eos_create(c->bucket_alloc);
+         APR_BRIGADE_INSERT_TAIL(bb, b);
++        ctx->hit_eos = 1;
+     }
+ 
+     return APR_SUCCESS;
+@@ -910,6 +911,14 @@
+         ctx = f->ctx;
+     }
+ 
++    if (ctx->hit_eos) {
++        /* Match behaviour of HTTP_IN if filter is re-invoked after
++         * hitting EOS: give back another EOS. */
++        apr_bucket *e = apr_bucket_eos_create(f->c->bucket_alloc);
++        APR_BRIGADE_INSERT_TAIL(bb, e);
++        return APR_SUCCESS;
++    }
++
+     if (ctx->noop) {
+         ap_remove_input_filter(f);
+         return ap_get_brigade(f->next, bb, mode, block, readbytes);
diff --git a/httpd.spec b/httpd.spec
index c4ac54e..d8d05e5 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.2
-Release: 19%{?dist}
+Release: 20%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -53,6 +53,7 @@ Patch41: httpd-2.4.2-r1327036+.patch
 Patch42: httpd-2.4.2-r1326980+.patch
 Patch43: httpd-2.4.2-r1332643+.patch
 Patch44: httpd-2.4.2-r1346905.patch
+Patch45: httpd-2.4.2-r1357685.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -167,6 +168,7 @@ authentication to the Apache HTTP Server.
 %patch42 -p1 -b .r1326980+
 %patch43 -p1 -b .r1332643+
 %patch44 -p1 -b .r1346905
+%patch45 -p1 -b .r1357685
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -581,6 +583,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Thu Jul  5 2012 Joe Orton <jorton at redhat.com> - 2.4.2-20
+- mod_ext_filter: fix error_log warnings
+
 * Mon Jul  2 2012 Joe Orton <jorton at redhat.com> - 2.4.2-19
 - support "configtest" and "graceful" as initscripts "legacy actions"