tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r535843 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c
Date Mon, 07 May 2007 10:46:49 GMT
Author: mturk
Date: Mon May  7 03:46:45 2007
New Revision: 535843

URL: http://svn.apache.org/viewvc?view=rev&rev=535843
Log:
Fix the detection of client connection status.
If everything is send and the client aborted the
connection immediately, allow Tomcat to send the
END packet to suppress the
WARN [org.apache.jk.common.ChannelSocket] processCallbacks status 2  log messages.

Modified:
    tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
    tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=535843&r1=535842&r2=535843
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon May  7 03:46:45 2007
@@ -419,8 +419,12 @@
                 }
 
             }
-            if (p->r->connection->aborted)
+            if (ll && p->r->connection->aborted) {
+                /* Fail if there is something left to send and
+                 * the connection was aborted by the client
+                 */
                 return JK_FALSE;
+            }
         }
 
         return JK_TRUE;

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=535843&r1=535842&r2=535843
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon May  7 03:46:45 2007
@@ -456,8 +456,12 @@
                 ll -= r;
                 bb += r;
             }
-            if (p->r->connection->aborted)
+            if (ll && p->r->connection->aborted) {
+                /* Fail if there is something left to send and
+                 * the connection was aborted by the client
+                 */
                 return JK_FALSE;
+            }
         }
 
         return JK_TRUE;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message