cvs commit: modperl-2.0/t/filter/TestFilter input_body.pm

[dougm]

dougm   01/11/05 16:07:53

  Modified:t/filter/TestFilter input_body.pm
  Log:
  change filter logic to what is currently considered the right way
  
  Revision  ChangesPath
  1.7   +18 -10modperl-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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- input_body.pm 2001/08/10 03:06:45 1.6
  +++ input_body.pm 2001/11/06 00:07:53 1.7
  @@ -15,28 +15,36 @@
   sub handler : FilterRequestHandler {
   my($filter, $bb, $mode, $readbytes) = @_;
   
  -if ($bb-empty) {
  -my $rv = $filter-next-get_brigade($bb, $mode, $readbytes);
  +my $ctx_bb = APR::Brigade-new($filter-r-pool);
   
  -if ($rv != APR::SUCCESS) {
  -return $rv;
  -}
  +my $rv = $filter-next-get_brigade($ctx_bb, $mode, $readbytes);
  +
  +if ($rv != APR::SUCCESS) {
  +return $rv;
   }
   
  -while (!$bb-empty) {
  -my $bucket = $bb-first;
  +while (!$ctx_bb-empty) {
   my $data;
  -my $status = $bucket-read($data);
  +my $bucket = $ctx_bb-first;
   
   $bucket-remove;
   
  +if ($bucket-is_eos) {
  +$bb-insert_tail($bucket);
  +last;
  +}
  +
  +my $status = $bucket-read($data);
  +
  +if ($status != APR::SUCCESS) {
  +return $status;
  +}
  +
   if ($data) {
   $bucket = APR::Bucket-new(scalar reverse $data);
   }
   
   $bb-insert_tail($bucket);
  -
  -last if $bucket-is_eos;
   }
   
   Apache::OK;
  
  
  

cvs commit: modperl-2.0/t/filter input_body.t

[dougm]

dougm   01/11/05 16:08:10

  Modified:t/filter input_body.t
  Log:
  re-enable test
  
  Revision  ChangesPath
  1.3   +1 -1  modperl-2.0/t/filter/input_body.t
  
  Index: input_body.t
  ===
  RCS file: /home/cvs/modperl-2.0/t/filter/input_body.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- input_body.t  2001/10/05 23:51:26 1.2
  +++ input_body.t  2001/11/06 00:08:10 1.3
  @@ -5,7 +5,7 @@
   use Apache::TestRequest;
   
   #XXX: skip input_body filter test until filter changes dust settles
  -plan tests = 2, sub {0}; #\have_lwp;
  +plan tests = 2, \have_lwp;
   
   my $location = '/TestFilter::input_body';
   
  
  
  

cvs commit: modperl-2.0/t/filter/TestFilter input_msg.pm

[dougm]

dougm   01/11/05 16:08:46

  Modified:t/filter/TestFilter input_msg.pm
  Log:
  change filter logic to what is currently considered the right way
  
  Revision  ChangesPath
  1.7   +21 -11modperl-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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- input_msg.pm  2001/07/15 22:33:49 1.6
  +++ input_msg.pm  2001/11/06 00:08:46 1.7
  @@ -16,26 +16,36 @@
   sub handler : FilterConnectionHandler {
   my($filter, $bb, $mode, $readbytes) = @_;
   
  -if ($bb-empty) {
  -my $rv = $filter-next-get_brigade($bb, $mode, $readbytes);
  +my $ctx_bb = APR::Brigade-new($filter-c-pool);
   
  -if ($rv != APR::SUCCESS) {
  -return $rv;
  -}
  +my $rv = $filter-next-get_brigade($ctx_bb, $mode, $readbytes);
  +
  +if ($rv != APR::SUCCESS) {
  +return $rv;
   }
   
  -for (my $bucket = $bb-first; $bucket; $bucket = $bb-next($bucket)) {
  +while (!$ctx_bb-empty) {
   my $data;
  -my $status = $bucket-read($data);
  +my $bucket = $ctx_bb-first;
   
   $bucket-remove;
   
  -if ($data and $data =~ s,GET $from_url,GET $to_url,) {
  -$bb-insert_tail(APR::Bucket-new($data));
  -}
  -else {
  +if ($bucket-is_eos) {
   $bb-insert_tail($bucket);
  +last;
   }
  +
  +my $status = $bucket-read($data);
  +
  +if ($status != APR::SUCCESS) {
  +return $status;
  +}
  +
  +if ($data and $data =~ s,GET $from_url,GET $to_url,) {
  +$bucket = APR::Bucket-new($data);
  +}
  +
  +$bb-insert_tail($bucket);
   }
   
   Apache::OK;