perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: modperl-2.0/xs/maps apache_functions.map
Date Fri, 25 Jan 2002 04:04:22 GMT
dougm       02/01/24 20:04:22

  Modified:    src/modules/perl modperl_filter.c modperl_filter.h
               xs/Apache/Filter Apache__Filter.h
               xs/maps  apache_functions.map
  Log:
  adjust to ap_get_brigade() API change
  
  Revision  Changes    Path
  1.31      +3 -3      modperl-2.0/src/modules/perl/modperl_filter.c
  
  Index: modperl_filter.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- modperl_filter.c	20 Jan 2002 18:37:04 -0000	1.30
  +++ modperl_filter.c	25 Jan 2002 04:04:22 -0000	1.31
  @@ -116,7 +116,7 @@
   int modperl_run_filter(modperl_filter_t *filter,
                          ap_input_mode_t mode,
                          apr_read_type_e block,
  -                       apr_off_t *readbytes)
  +                       apr_off_t readbytes)
   {
       AV *args = Nullav;
       int status;
  @@ -140,7 +140,7 @@
       if (filter->mode == MP_INPUT_FILTER_MODE) {
           av_push(args, newSViv(mode));
           av_push(args, newSViv(block));
  -        av_push(args, newSViv(*readbytes));
  +        av_push(args, newSViv(readbytes));
       }
   
       if ((status = modperl_callback(aTHX_ handler, p, r, s, args)) != OK) {
  @@ -394,7 +394,7 @@
                                             apr_bucket_brigade *bb,
                                             ap_input_mode_t mode,
                                             apr_read_type_e block,
  -                                          apr_off_t *readbytes)
  +                                          apr_off_t readbytes)
   {
       modperl_filter_t *filter;
       int status;
  
  
  
  1.12      +2 -2      modperl-2.0/src/modules/perl/modperl_filter.h
  
  Index: modperl_filter.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- modperl_filter.h	20 Jan 2002 18:37:04 -0000	1.11
  +++ modperl_filter.h	25 Jan 2002 04:04:22 -0000	1.12
  @@ -28,7 +28,7 @@
   int modperl_run_filter(modperl_filter_t *filter,
                          ap_input_mode_t mode,
                          apr_read_type_e block,
  -                       apr_off_t *readbytes);
  +                       apr_off_t readbytes);
   
   /* output filters */
   apr_status_t modperl_output_filter_handler(ap_filter_t *f,
  @@ -56,7 +56,7 @@
                                             apr_bucket_brigade *bb,
                                             ap_input_mode_t mode,
                                             apr_read_type_e block,
  -                                          apr_off_t *readbytes);
  +                                          apr_off_t readbytes);
   
   void modperl_input_filter_register_connection(conn_rec *c);
   
  
  
  
  1.18      +0 -17     modperl-2.0/xs/Apache/Filter/Apache__Filter.h
  
  Index: Apache__Filter.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/Apache/Filter/Apache__Filter.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Apache__Filter.h	20 Jan 2002 18:37:05 -0000	1.17
  +++ Apache__Filter.h	25 Jan 2002 04:04:22 -0000	1.18
  @@ -60,23 +60,6 @@
       return len;
   }
   
  -static apr_status_t mpxs_ap_get_brigade(pTHX_ ap_filter_t *filter,
  -                                        apr_bucket_brigade *brigade,
  -                                        ap_input_mode_t mode,
  -                                        apr_read_type_e block,
  -                                        SV *svreadbytes)
  -{
  -    apr_off_t readbytes = svreadbytes ? SvIV(svreadbytes) : 0;
  -    apr_status_t status = ap_get_brigade(filter, brigade,
  -                                         mode, block, &readbytes);
  -
  -    if (svreadbytes) {
  -        sv_setiv(svreadbytes, readbytes);
  -    }
  -
  -    return status;
  -}
  -
   static MP_INLINE U32 *modperl_filter_attributes(SV *package, SV *cvrv)
   {
       return (U32 *)&MP_CODE_ATTRS(SvRV(cvrv));
  
  
  
  1.43      +2 -2      modperl-2.0/xs/maps/apache_functions.map
  
  Index: apache_functions.map
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- apache_functions.map	21 Jan 2002 08:27:30 -0000	1.42
  +++ apache_functions.map	25 Jan 2002 04:04:22 -0000	1.43
  @@ -203,10 +203,10 @@
   PACKAGE=guess
   ~ap_add_output_filter
   ~ap_add_input_filter
  - ap_get_brigade | mpxs_ | \
  + ap_get_brigade | | \
                  filter, bucket, mode=AP_MODE_READBYTES, \
                  block=APR_BLOCK_READ, \
  -               SV *:readbytes=Nullsv
  +               readbytes=0
    ap_pass_brigade
    ap_register_input_filter
    ap_register_output_filter
  
  
  

Mime
View raw message