httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/main buff.c
Date Sun, 04 Jun 2000 19:16:37 GMT
trawick     00/06/04 12:16:37

  Modified:    src/main buff.c
  Log:
  APACHE_XLATE: fix bogus parm lists to ap_bread_core() and
  ap_xlate_conv_buffer() in ap_bread_xlate()
  
  Revision  Changes    Path
  1.48      +8 -3      apache-2.0/src/main/buff.c
  
  Index: buff.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- buff.c	2000/06/02 23:04:55	1.47
  +++ buff.c	2000/06/04 19:16:37	1.48
  @@ -470,12 +470,17 @@
       ap_status_t rv;
       ap_size_t inbytes_left, outbytes_left;
       
  -    rv = ap_bread_core(fb, fb->xbuf, nbyte, bytes_read);
  +    rv = ap_bread_core(fb, buf, nbyte, bytes_read);
       if (rv == APR_SUCCESS && *bytes_read) {
           inbytes_left = outbytes_left = *bytes_read;
  -        rv = ap_xlate_conv_buffer(fb->read_xlate, fb->inptr, &inbytes_left,
  +        rv = ap_xlate_conv_buffer(fb->read_xlate, buf, &inbytes_left,
                                     buf, &outbytes_left);
  -        ap_assert(!rv && !inbytes_left && !outbytes_left);
  +        if (!rv && (inbytes_left || outbytes_left)) {
  +            *bytes_read = 0;
  +            rv = APR_EINVAL;
  +            fb->saved_errno = rv;
  +            doerror(fb, B_RD);
  +        }
       }
   
       return rv;
  
  
  

Mime
View raw message