tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hgo...@apache.org
Subject svn commit: r567689 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Date Mon, 20 Aug 2007 13:16:13 GMT
Author: hgomez
Date: Mon Aug 20 06:16:13 2007
New Revision: 567689

URL: http://svn.apache.org/viewvc?rev=567689&view=rev
Log:
Fix for send_bodyct on i5/OS. The problem was in jk (not flushing) and not on IBM implementation
(my bad)

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

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?rev=567689&r1=567688&r2=567689&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Aug 20 06:16:13 2007
@@ -319,12 +319,6 @@
     /* ap_send_http_header(r); */
     p->response_started = JK_TRUE;
 
-	/* hgomez@20070516: under i5/OS this flag is not set correctly */
-	/* We should check with Rochester Labs what could be the problem */
-#ifdef AS400
-        r->sent_bodyct = 1;
-#endif
-
     return JK_TRUE;
 }
 
@@ -375,7 +369,7 @@
 
 static void JK_METHOD ws_flush(jk_ws_service_t *s)
 {
-#ifndef AS400
+#if ! (defined(AS400) && !defined(AS400_UTF8))
     if (s && s->ws_private) {
         apache_private_data_t *p = s->ws_private;
         ap_rflush(p->r);
@@ -423,7 +417,7 @@
                 }
             }
             if (p->r->header_only) {
-#ifndef AS400
+#if ! (defined(AS400) && !defined(AS400_UTF8))
                 ap_rflush(p->r);
 #endif
                 return JK_TRUE;
@@ -2248,8 +2242,6 @@
                 /* If tomcat returned no body and the status is not OK,
                    let apache handle the error code */
 
-/* hgomez@20070516 : under i5/OS sent_bodyct is not set correctly */
-/*                   check for header_only to see if there was a body */
                 if (!r->sent_bodyct && r->status >= HTTP_BAD_REQUEST) {
                     jk_log(xconf->log, JK_LOG_INFO, "No body with status=%d"
                            " for worker=%s",



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


Mime
View raw message