tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Date Sat, 26 Mar 2005 09:37:10 GMT
mturk       2005/03/26 01:37:10

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Do not abort the connection if request is invalid, so that client receives
  apache http error code, instead just dropping connection.
  
  Revision  Changes    Path
  1.134     +4 -4      jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
  retrieving revision 1.133
  retrieving revision 1.134
  diff -u -r1.133 -r1.134
  --- mod_jk.c	24 Mar 2005 10:19:19 -0000	1.133
  +++ mod_jk.c	26 Mar 2005 09:37:10 -0000	1.134
  @@ -38,7 +38,6 @@
   #include "http_main.h"
   #include "http_log.h"
   #include "util_script.h"
  -
   #include "ap_mpm.h"
   
   #ifdef AS400
  @@ -1964,12 +1963,13 @@
                   return OK;      /* NOT r->status, even if it has changed. */
               }
               else if (rc == JK_CLIENT_ERROR) {
  -                r->connection->aborted = 1;
  +                if (is_error != HTTP_REQUEST_ENTITY_TOO_LARGE)
  +                    r->connection->aborted = 1;
                   jk_log(xconf->log, JK_LOG_INFO, "Aborting connection"
                          " for worker=%s",
                          worker_name);
                   JK_TRACE_EXIT(xconf->log);
  -                return OK;
  +                return is_error;
               }
               else {
                   jk_log(xconf->log, JK_LOG_INFO, "Service error=%d"
  
  
  

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


Mime
View raw message