tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r696607 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
Date Thu, 18 Sep 2008 09:06:42 GMT
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


Mime
View raw message