From 07259916a98ed2856754551e88be67522c0e3a9d Mon Sep 17 00:00:00 2001 From: mturk Date: Thu, 3 Feb 2011 10:23:20 +0000 Subject: [PATCH] Make sure flush packet is not send after END_RESPONSE packet. Should handle BZ49929 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1066772 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/ajp/AjpAprProcessor.java | 2 +- java/org/apache/coyote/ajp/AjpProcessor.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java index d6926e57b..764762079 100644 --- a/java/org/apache/coyote/ajp/AjpAprProcessor.java +++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java @@ -663,7 +663,7 @@ public class AjpAprProcessor extends AbstractAjpProcessor { outputBuffer.clear(); } // Send explicit flush message - if (explicit) { + if (explicit && !finished) { if (Socket.sendb(socketRef, flushMessageBuffer, 0, flushMessageBuffer.position()) < 0) { throw new IOException(sm.getString("ajpprocessor.failedflush")); diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index 45b2fd820..83afa3d78 100644 --- a/java/org/apache/coyote/ajp/AjpProcessor.java +++ b/java/org/apache/coyote/ajp/AjpProcessor.java @@ -578,8 +578,10 @@ public class AjpProcessor extends AbstractAjpProcessor { */ @Override protected void flush(boolean explicit) throws IOException { - // Send the flush message - output.write(flushMessageArray); + if (!finished) { + // Send the flush message + output.write(flushMessageArray); + } } -- 2.11.0