cvs commit: modperl-2.0/xs/maps apache_functions.map

2001-04-23 Thread dougm 

dougm   01/04/23 19:26:19

  Modified:src/modules/perl modperl_filter.c modperl_filter.h
   t/filter/TestFilter input_body.pm input_msg.pm
   xs/Apache/Filter Apache__Filter.h
   xs/maps  apache_functions.map
  Log:
   adjust to ap_get_brigade() / input filter api changes
  
  Revision  ChangesPath
  1.17  +7 -4  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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- modperl_filter.c  2001/04/20 00:43:47 1.16
  +++ modperl_filter.c  2001/04/24 02:26:17 1.17
  @@ -86,7 +86,8 @@
   return mg ? (modperl_filter_t *)mg-mg_ptr : NULL;
   }
   
  -int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode)
  +int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode,
  +   apr_size_t *readbytes)
   {
   AV *args = Nullav;
   int status;
  @@ -109,6 +110,7 @@
   
   if (filter-mode == MP_INPUT_FILTER_MODE) {
   av_push(args, newSViv(mode));
  +av_push(args, newSViv(*readbytes));
   }
   
   if ((status = modperl_callback(aTHX_ handler, p, s, args)) != OK) {
  @@ -321,7 +323,7 @@
   }
   else {
   filter = modperl_filter_new(f, bb, MP_OUTPUT_FILTER_MODE);
  -status = modperl_run_filter(filter, 0);
  +status = modperl_run_filter(filter, 0, 0);
   }
   
   switch (status) {
  @@ -336,7 +338,8 @@
   
   apr_status_t modperl_input_filter_handler(ap_filter_t *f,
 apr_bucket_brigade *bb,
  -  ap_input_mode_t mode)
  +  ap_input_mode_t mode,
  +  apr_size_t *readbytes)
   {
   modperl_filter_t *filter;
   int status;
  @@ -348,7 +351,7 @@
   }
   else {
   filter = modperl_filter_new(f, bb, MP_INPUT_FILTER_MODE);
  -status = modperl_run_filter(filter, mode);
  +status = modperl_run_filter(filter, mode, readbytes);
   }
   
   switch (status) {
  
  
  
  1.6   +4 -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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- modperl_filter.h  2001/04/20 00:43:47 1.5
  +++ modperl_filter.h  2001/04/24 02:26:17 1.6
  @@ -25,7 +25,8 @@
   
   modperl_filter_t *modperl_filter_mg_get(pTHX_ SV *obj);
   
  -int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode);
  +int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode,
  +   apr_size_t *readbytes);
   
   /* output filters */
   apr_status_t modperl_output_filter_handler(ap_filter_t *f,
  @@ -49,7 +50,8 @@
   /* input filters */
   apr_status_t modperl_input_filter_handler(ap_filter_t *f,
 apr_bucket_brigade *bb,
  -  ap_input_mode_t mode);
  +  ap_input_mode_t mode,
  +  apr_size_t *readbytes);
   
   int modperl_input_filter_register_connection(conn_rec *c);
   
  
  
  
  1.4   +2 -2  modperl-2.0/t/filter/TestFilter/input_body.pm
  
  Index: input_body.pm
  ===
  RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/input_body.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- input_body.pm 2001/04/20 01:21:28 1.3
  +++ input_body.pm 2001/04/24 02:26:17 1.4
  @@ -13,10 +13,10 @@
   use APR::Bucket ();
   
   sub handler : InputFilterBody {
  -my($filter, $bb, $mode) = @_;
  +my($filter, $bb, $mode, $readbytes) = @_;
   
   if ($bb-empty) {
  -my $rv = $filter-next-get_brigade($bb, $mode);
  +my $rv = $filter-next-get_brigade($bb, $mode, $readbytes);
   
   if ($rv != APR::SUCCESS) {
   return $rv;
  
  
  
  1.4   +2 -2  modperl-2.0/t/filter/TestFilter/input_msg.pm
  
  Index: input_msg.pm
  ===
  RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/input_msg.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- input_msg.pm  2001/04/20 01:21:28 1.3
  +++ input_msg.pm  2001/04/24 02:26:17 1.4
  @@ -14,10 +14,10 @@
   my $to_url = '/TestFilter::input_msg::response';
   
   sub handler : InputFilterMessage {
  -my($filter, $bb, $mode) = @_;
  +my($filter, $bb, $mode, $readbytes) = @_;

cvs commit: modperl-2.0/src/modules/perl modperl_types.h

2001-04-23 Thread dougm 

dougm   01/04/23 22:10:41

  Modified:src/modules/perl modperl_types.h
  Log:
  allow MP_IOBUFSIZE to be -D defined
  
  Revision  ChangesPath
  1.37  +6 -4  modperl-2.0/src/modules/perl/modperl_types.h
  
  Index: modperl_types.h
  ===
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_types.h,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- modperl_types.h   2001/04/19 21:26:35 1.36
  +++ modperl_types.h   2001/04/24 05:10:40 1.37
  @@ -1,10 +1,12 @@
   #ifndef MODPERL_TYPES_H
   #define MODPERL_TYPES_H
   
  -#ifdef AP_IOBUFSIZE
  -#   define MP_IOBUFSIZE AP_IOBUFSIZE
  -#else
  -#   define MP_IOBUFSIZE 8192
  +#ifndef MP_IOBUFSIZE
  +#   ifdef AP_IOBUFSIZE
  +#  define MP_IOBUFSIZE AP_IOBUFSIZE
  +#   else
  +#  define MP_IOBUFSIZE 8192
  +#   endif
   #endif
   
   /* aliases */

cvs commit: modperl-2.0/pod modperl_dev.pod

2001-04-23 Thread sbekman 

sbekman 01/04/23 22:50:28

  Modified:pod  modperl_dev.pod
  Log:
  document -DMP_IOBUFSIZE= option
  
  Revision  ChangesPath
  1.17  +14 -0 modperl-2.0/pod/modperl_dev.pod
  
  Index: modperl_dev.pod
  ===
  RCS file: /home/cvs/modperl-2.0/pod/modperl_dev.pod,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- modperl_dev.pod   2001/04/20 16:50:53 1.16
  +++ modperl_dev.pod   2001/04/24 05:50:28 1.17
  @@ -96,6 +96,20 @@
   
   =back
   
  +mod_perl specific compiler opts:
  +
  +=over 4
  +
  +=item -DMP_IOBUFSIZE
  +
  +Change the default mod_perl's 8k IO buffer size, e.g. 16k:
  +
  + MP_CCOPTS=-DMP_IOBUFSIZE=16384
  +
  +=back
  +
  +
  +
   Options can also be specified in the file Cmakepl_args.mod_perl2.
   Command line options override those from Cmakepl_args_mod_perl2
   and those from MP_OPTIONS_FILE.