httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Mon, 01 Oct 2001 21:01:14 GMT
gregames    01/10/01 14:01:14

  Modified:    server   request.c
  Log:
  ap_sub_req_output_filter:  don't pass along a brigade if it becomes empty
  after deleting the EOS bucket.
  
  This prevents a seg fault in mod_include when the connection dies.  There
  doesn't seem to be much point in passing empty brigades in general.
  
  Revision  Changes    Path
  1.58      +6 -1      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- request.c	2001/09/29 06:54:08	1.57
  +++ request.c	2001/10/01 21:01:14	1.58
  @@ -1520,7 +1520,12 @@
       if (APR_BUCKET_IS_EOS(e)) {
           apr_bucket_delete(e);
       }
  -    return ap_pass_brigade(f->next, bb);
  +    if (!APR_BRIGADE_EMPTY(bb)) {
  +        return ap_pass_brigade(f->next, bb);
  +    }
  +    else {
  +        return APR_SUCCESS;
  +    }
   }
   
    
  
  
  

Mime
View raw message