craigmcc    00/11/04 16:01:25

  Modified:    src/native/apache/jserv Tag: tomcat_32 jserv_ajpv12.c
  Log:
  If ap_bread() returns a negative value (to indicate that an error occurred),
  return -1 ourselves instead of trying to call ap_bwrite() with a length of
  -1.  This was causing a GPF on Windows.
  
  Submitted by: [EMAIL PROTECTED]
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.4.1   +3 -0      jakarta-tomcat/src/native/apache/jserv/Attic/jserv_ajpv12.c
  
  Index: jserv_ajpv12.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/apache/jserv/Attic/jserv_ajpv12.c,v
  retrieving revision 1.7
  retrieving revision 1.7.4.1
  diff -u -r1.7 -r1.7.4.1
  --- jserv_ajpv12.c    2000/04/04 19:58:19     1.7
  +++ jserv_ajpv12.c    2000/11/05 00:01:24     1.7.4.1
  @@ -57,7 +57,7 @@
    * Description: ajpv1.2 protocol, used to call local or remote jserv hosts   *
    * Author:      Pierpaolo Fumagalli <[EMAIL PROTECTED]>                       *
    * Author:      Michal Mosiewicz <[EMAIL PROTECTED]>                         *
  - * Version:     $Revision: 1.7 $                                             *
  + * Version:     $Revision: 1.7.4.1 $                                             *
    *****************************************************************************/
   #include "jserv.h"
   
  @@ -393,6 +393,9 @@
                   char buffer[HUGE_STRING_LEN];
                   int len;
                   len = (int) ap_bread(buffsocket, buffer, HUGE_STRING_LEN);
  +                if (len < 0) {
  +                  return -1;
  +                }
   
   #ifdef HAVE_APFD /* IBM Apache */
                   if(r->connection->client->pfd->sd >= 0) {
  
  
  

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

Reply via email to