These changes fixes the following problem:
When using ajp12 with mod_jk, httpd procesess handling a request 
will hang, using all cpu time, if tomcat is shut down before the headers
of the request have been sent from tomcat.

BR,
Stefan Åberg

***
/usr/local/src/apache/jakarta-tomcat-3.2.1-src/src/native/jk/jk_sockbuf.c
Tue Mar  6 10:10:40 2001
--- jk_sockbuf.c        Tue Mar  6 10:15:54 2001
***************
*** 131,137 ****
  
          if(sb->end == sb->start) {
              sb->end = sb->start = 0;
!             if(!fill_buffer(sb)) {
                  return JK_FALSE;
              }
          }
--- 131,137 ----
  
          if(sb->end == sb->start) {
              sb->end = sb->start = 0;
!             if(fill_buffer(sb) < 0) {
                  return JK_FALSE;
              }
          }
***************
*** 169,175 ****
                      return JK_TRUE;
                  }
              }
!             if(!fill_buffer(sb)) {
                  return JK_FALSE;
              }
          }
--- 169,175 ----
                      return JK_TRUE;
                  }
              }
!             if(fill_buffer(sb) <= 0 ) {
                  return JK_FALSE;
              }
          }
***************
*** 205,215 ****
                 SOCKBUF_SIZE - sb->end, 0);   
  
      if(ret < 0) {
!         return JK_FALSE;
      } 
  
      sb->end += ret;
  
!     return JK_TRUE;
  }
- 
--- 205,214 ----
                 SOCKBUF_SIZE - sb->end, 0);   
  
      if(ret < 0) {
!         return ret;
      } 
  
      sb->end += ret;
  
!     return ret;
  }

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

Reply via email to