tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r411717 - in /tomcat/connectors/trunk/jk: native/common/jk_ajp_common.c native/common/jk_ajp_common.h xdocs/changelog.xml xdocs/config/workers.xml
Date Mon, 05 Jun 2006 08:50:10 GMT
Author: mturk
Date: Mon Jun  5 01:50:10 2006
New Revision: 411717

URL: http://svn.apache.org/viewvc?rev=411717&view=rev
Log:
Added RECOVER_ABORT_IF_CLIENTERROR recovery_option
that closes the connection if client connection
is broken during the request.

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
    tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h
    tomcat/connectors/trunk/jk/xdocs/changelog.xml
    tomcat/connectors/trunk/jk/xdocs/config/workers.xml

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=411717&r1=411716&r2=411717&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Mon Jun  5 01:50:10 2006
@@ -1753,6 +1753,10 @@
             }
             if (err == JK_CLIENT_ERROR) {
                 *is_error = JK_HTTP_BAD_REQUEST;
+                if (p->worker->recovery_opts & RECOVER_ABORT_IF_CLIENTERROR) {
+                    /* Mark the endpoint for shutdown */
+                    p->reuse = JK_FALSE;
+                }
                 jk_log(l, JK_LOG_INFO,
                        "Sending request to tomcat failed, "
                        "because of client error "

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h?rev=411717&r1=411716&r2=411717&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h Mon Jun  5 01:50:10 2006
@@ -198,6 +198,7 @@
 
 #define RECOVER_ABORT_IF_TCGETREQUEST    0x0001 /* DONT RECOVER IF TOMCAT FAIL AFTER RECEIVING
REQUEST */
 #define RECOVER_ABORT_IF_TCSENDHEADER    0x0002 /* DONT RECOVER IF TOMCAT FAIL AFTER SENDING
HEADERS */
+#define RECOVER_ABORT_IF_CLIENTERROR     0x0006 /* CLOSE THE SOCKET IN CASE OF CLIENT ERROR
*/
 
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/changelog.xml?rev=411717&r1=411716&r2=411717&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/changelog.xml Mon Jun  5 01:50:10 2006
@@ -26,6 +26,10 @@
   <subsection name="Native">
     <changelog>
       <update>
+      Added RECOVER_ABORT_IF_CLIENTERROR recovery_option that closes
+      the connection if client connection is broken during the request. (mturk)
+      </update>
+      <update>
       Renamed cache_timeout firective to connection_pool_timeout. (mturk)
       </update>
       <update>

Modified: tomcat/connectors/trunk/jk/xdocs/config/workers.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/workers.xml?rev=411717&r1=411716&r2=411717&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/workers.xml Mon Jun  5 01:50:10 2006
@@ -385,6 +385,12 @@
 and works on all servlet engines supporting ajp13.
 Full recovery by default.
 </p>
+<p>If the value 4 is added to the recovery options, the connection
+between the webserver and tomcat will be closed if the client connection
+to the webserver is terminated during the request/response cycle. This allows
+to inform the servlet engine about broken client connections during lengthy operations.
+This features has been added in <b>jk 1.2.16</b>
+</p>
 </directive>
 
 <directive name="distance" default="0" required="false">



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


Mime
View raw message