From: Jeff Trawick <trawick@apache.org>
Date: Mon, 10 Jun 2002 18:51:38 +0000 (+0000)
Subject: ap_finalize_sub_req_protocol() shouldn't send an EOS bucket if
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be3944aa7f4e2d049afbbcc9f53ad7d508bd5f8e;p=apache

ap_finalize_sub_req_protocol() shouldn't send an EOS bucket if
one was already sent.

mod_ext_filter performs some one-time processing when it sees EOS.
When it saw EOS more than once and a subsequent attempt to close a
file failed, it issued the log message described in PR 9644.

PR:      9644


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95595 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index d88a4d198d..41a2c69cdf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.37
 
+  *) ap_finalize_sub_req_protocol() shouldn't send an EOS bucket if
+     one was already sent.  PR 9644  [Jeff Trawick]
+
   *) Fix the display of the default name for the mime types config
      file.  PR 9729  [Matthew Brecknell <mbrecknell@orchestream.com>]
 
diff --git a/server/protocol.c b/server/protocol.c
index dbe6020158..cfc03cd6ea 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1033,7 +1033,10 @@ static void end_output_stream(request_rec *r)
 
 void ap_finalize_sub_req_protocol(request_rec *sub)
 {
-    end_output_stream(sub);
+    /* tell the filter chain there is no more content coming */
+    if (!sub->eos_sent) {
+        end_output_stream(sub);
+    }
 }
 
 /* finalize_request_protocol is called at completion of sending the