stas        2004/09/25 11:51:58

  Modified:    t/response/TestModperl merge.pm
  Log:
  - revert the last attempt which didn't work
  - add a temp workaround
  
  Revision  Changes    Path
  1.11      +3 -4      modperl-2.0/t/response/TestModperl/merge.pm
  
  Index: merge.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/merge.pm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- merge.pm  25 Sep 2004 18:48:18 -0000      1.10
  +++ merge.pm  25 Sep 2004 18:51:58 -0000      1.11
  @@ -81,14 +81,10 @@
   );
   
   sub handler {
  -
       my $r = shift;
   
       plan $r, tests => 10;
   
  -    # need to insert PerlPassEnv entries
  -    $r->subprocess_env;
  -
       my $uri = $r->uri;
       my $hash;
   
  @@ -136,6 +132,9 @@
       PerlModule TestModperl::merge
   
       <VirtualHost TestModperl::merge>
  +        # XXX: temp workaround
  +        PerlPostReadRequestHandler Apache::OK
  +
           # these should pass through all merges untouched
           PerlPassEnv  APACHE_TEST_HOSTTYPE
           PerlSetEnv   MergeSetEnv1  SetEnv1Val
  
  
  

Reply via email to