Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 31018 invoked from network); 18 Sep 2008 09:07:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Sep 2008 09:07:06 -0000 Received: (qmail 457 invoked by uid 500); 18 Sep 2008 09:07:00 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 390 invoked by uid 500); 18 Sep 2008 09:07:00 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 379 invoked by uid 99); 18 Sep 2008 09:07:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2008 02:07:00 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2008 09:06:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ABC5623889A0; Thu, 18 Sep 2008 02:06:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r696607 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Date: Thu, 18 Sep 2008 09:06:42 -0000 To: dev@tomcat.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080918090642.ABC5623889A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mturk Date: Thu Sep 18 02:06:41 2008 New Revision: 696607 URL: http://svn.apache.org/viewvc?rev=696607&view=rev Log: Favor done() instead flush() if available. This will send EOS instead FLUSH+EOS Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=696607&r1=696606&r2=696607&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Thu Sep 18 02:06:41 2008 @@ -1746,12 +1746,14 @@ } ae->reuse = JK_TRUE; } - /* Flush after the last write */ - if (r->flush && !r->flush_packets) - r->flush(r); - /* Done with response */ - if (r->done) + if (r->done) { + /* Done with response */ r->done(r); + } + else if (r->flush && !r->flush_packets) { + /* Flush after the last write */ + r->flush(r); + } JK_TRACE_EXIT(l); return JK_AJP13_END_RESPONSE; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org