You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2005/03/26 10:28:56 UTC
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c jk_global.h jk_lb_worker.c
mturk 2005/03/26 01:28:56
Modified: jk/native/common jk_ajp_common.c jk_global.h jk_lb_worker.c
Log:
Use HTTP_REQUEST_ENTITY_TOO_LARGE when marshaling fails.
Revision Changes Path
1.95 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- jk_ajp_common.c 26 Mar 2005 08:42:14 -0000 1.94
+++ jk_ajp_common.c 26 Mar 2005 09:28:56 -0000 1.95
@@ -1634,7 +1634,7 @@
* We get here initial request (in reqmsg)
*/
if (!ajp_marshal_into_msgb(op->request, s, l, p)) {
- *is_error = JK_HTTP_BAD_REQUEST;
+ *is_error = JK_REQUEST_TOO_LARGE;
jk_log(l, JK_LOG_INFO,
"Creating AJP message failed, "
"without recovery");
1.46 +2 -1 jakarta-tomcat-connectors/jk/native/common/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- jk_global.h 26 Mar 2005 08:41:04 -0000 1.45
+++ jk_global.h 26 Mar 2005 09:28:56 -0000 1.46
@@ -176,6 +176,7 @@
#define JK_HTTP_OK 200
#define JK_HTTP_BAD_REQUEST 400
+#define JK_REQUEST_TOO_LARGE 413
#define JK_HTTP_SERVER_ERROR 500
#define JK_HTTP_SERVER_BUSY 503
1.74 +1 -2 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- jk_lb_worker.c 26 Mar 2005 08:44:11 -0000 1.73
+++ jk_lb_worker.c 26 Mar 2005 09:28:56 -0000 1.74
@@ -633,7 +633,6 @@
* Clent error !!!
* Since this is bad request do not fail over.
*/
- is_service_error = JK_HTTP_BAD_REQUEST;
rec->s->errors++;
rec->s->in_error_state = JK_FALSE;
rec->s->in_recovering = JK_FALSE;
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org