Author: rjung
Date: Mon Feb 22 22:03:53 2010
New Revision: 915086
URL: http://svn.apache.org/viewvc?rev=915086&view=rev
Log:
Move hardening code into the switch in order to
keep state machine a bit easier to understand.
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=915086&r1=915085&r2=915086&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Mon Feb 22 22:03:53 2010
@@ -1764,18 +1764,6 @@
JK_TRACE_ENTER(l);
- if (ae->last_op == JK_AJP13_FORWARD_REQUEST &&
- code == JK_AJP13_SEND_BODY_CHUNK) {
- /* We have just send a request but received something
- * that probably originates from buffered response.
- */
- if (JK_IS_DEBUG_LEVEL(l)) {
- jk_log(l, JK_LOG_DEBUG,
- "Unexpected AJP13_SEND_BODY_CHUNK");
- }
- JK_TRACE_EXIT(l);
- return JK_AJP13_ERROR;
- }
switch (code) {
case JK_AJP13_SEND_HEADERS:
{
@@ -1830,6 +1818,17 @@
return JK_AJP13_SEND_HEADERS;
case JK_AJP13_SEND_BODY_CHUNK:
+ if (ae->last_op == JK_AJP13_FORWARD_REQUEST) {
+ /* We have just send a request but received something
+ * that probably originates from buffered response.
+ */
+ if (JK_IS_DEBUG_LEVEL(l)) {
+ jk_log(l, JK_LOG_DEBUG,
+ "Unexpected AJP13_SEND_BODY_CHUNK");
+ }
+ JK_TRACE_EXIT(l);
+ return JK_AJP13_ERROR;
+ }
if (!r->response_blocked) {
unsigned int len = (unsigned int)jk_b_get_int(msg);
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
