cvs commit: httpd-2.0/server util_filter.c

[rb...@apache.org]

rbb         01/04/12 13:06:50

  Modified:    .        CHANGES
               include  util_filter.h
               server   util_filter.c
  Log:
  The ap_f* functions should flush data to the filter that is passed in,
  not to the filter after the one passed in.  The fixes a bug, where one
  filter is skipped when using ap_f*.
  Submitted by:	Ryan Morgan <rm...@covalent.net>
  
  Revision  Changes    Path
  1.172     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.171
  retrieving revision 1.172
  diff -u -d -b -w -u -r1.171 -r1.172
  --- CHANGES	2001/04/12 07:34:16	1.171
  +++ CHANGES	2001/04/12 20:06:48	1.172
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.17-dev
   
  +  *) The ap_f* functions should flush data to the filter that is passed
  +     in, not the the filter after the one passed in.
  +     [Ryan Morgan <rm...@covalent.net>]
  +
     *) Make ab work again by changing its native types to apr types and formats.
        [Justin Erenkrantz <je...@ebuilt.com>]
   
  
  
  
  1.49      +3 -3      httpd-2.0/include/util_filter.h
  
  Index: util_filter.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/util_filter.h,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -d -b -w -u -r1.48 -r1.49
  --- util_filter.h	2001/03/17 15:58:09	1.48
  +++ util_filter.h	2001/04/12 20:06:49	1.49
  @@ -402,7 +402,7 @@
    * @param nbyte The number of bytes in the data
    */
   #define ap_fwrite(f, bb, data, nbyte) \
  -	apr_brigade_write(bb, ap_filter_flush, (f)->next, data, nbyte)
  +	apr_brigade_write(bb, ap_filter_flush, f, data, nbyte)
   
   /**
    * Write a buffer for the current filter, buffering if possible.
  @@ -411,7 +411,7 @@
    * @param str The string to write
    */
   #define ap_fputs(f, bb, str) \
  -	apr_brigade_puts(bb, ap_filter_flush, (f)->next, str)
  +	apr_brigade_puts(bb, ap_filter_flush, f, str)
   
   /**
    * Write a character for the current filter, buffering if possible.
  @@ -420,7 +420,7 @@
    * @param c The character to write
    */
   #define ap_fputc(f, bb, c) \
  -	apr_brigade_putc(bb, ap_filter_flush, (f)->next, c)
  +	apr_brigade_putc(bb, ap_filter_flush, f, c)
   
   /**
    * Write an unspecified number of strings to the current filter
  
  
  
  1.55      +3 -3      httpd-2.0/server/util_filter.c
  
  Index: util_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_filter.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -d -b -w -u -r1.54 -r1.55
  --- util_filter.c	2001/02/16 04:26:48	1.54
  +++ util_filter.c	2001/04/12 20:06:50	1.55
  @@ -279,7 +279,7 @@
   
       b = apr_bucket_flush_create();
       APR_BRIGADE_INSERT_TAIL(bb, b);
  -    return ap_pass_brigade(f->next, bb);
  +    return ap_pass_brigade(f, bb);
   }
   
   AP_DECLARE_NONSTD(int) ap_fputstrs(ap_filter_t *f, apr_bucket_brigade *bb, ...)
  @@ -288,7 +288,7 @@
       int res;
   
       va_start(args, bb);
  -    res = apr_brigade_vputstrs(bb, ap_filter_flush, f->next, args);
  +    res = apr_brigade_vputstrs(bb, ap_filter_flush, f, args);
       va_end(args);
       return res;
   }
  @@ -298,7 +298,7 @@
       int res;
   
       va_start(args, fmt);
  -    res = apr_brigade_vprintf(bb, ap_filter_flush, f->next, fmt, args);
  +    res = apr_brigade_vprintf(bb, ap_filter_flush, f, fmt, args);
       va_end(args);
       return res;
   }