perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: modperl-2.0 Changes
Date Mon, 02 Dec 2002 16:22:09 GMT
stas        2002/12/02 08:22:09

  Modified:    lib/ModPerl TestRun.pm
               .        Changes
  Added:       t/conf   extra.last.conf.in
  Log:
  Move the custom mod_perl 2.0 configuration bits out of the
  ModPerl::TestRun, where they don't belong, into a special config file
  which is included at the very end of httpd.conf
  
  Revision  Changes    Path
  1.1                  modperl-2.0/t/conf/extra.last.conf.in
  
  Index: extra.last.conf.in
  ===================================================================
  PerlModule Apache::Module
  
  ### --------------------------------- ###
  PerlLoadModule TestDirective::loadmodule
  
  MyTest one two
  ServerTest per-server
  
  <Location /TestDirective::loadmodule>
      MyOtherTest value
  </Location>
  
  ### --------------------------------- ###
  <Perl >
  push @Alias, ['/perl_sections', '@DocumentRoot@'],
  $Location{'/perl_sections'} = {
  	'PerlInitHandler' => 'ModPerl::Test::add_config',
  	'AuthType' => 'Basic',
  	'AuthName' => 'PerlSection',
  	'PerlAuthenHandler' => 'TestHooks::authen',
  	};
  </Perl>
  
  ### --------------------------------- ###
  Perl $TestDirective::perl::worked="yes";
  
  ### --------------------------------- ###
  =pod
  This is some pod data
  =over apache
  PerlSetVar TestDirective__pod_over_worked yes
  =back
  This is some more pod
  =cut
  PerlSetVar TestDirective__pod_cut_worked yes
  
  
  
  1.7       +0 -52     modperl-2.0/lib/ModPerl/TestRun.pm
  
  Index: TestRun.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/TestRun.pm,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TestRun.pm	7 Oct 2002 02:35:18 -0000	1.6
  +++ TestRun.pm	2 Dec 2002 16:22:09 -0000	1.7
  @@ -22,57 +22,5 @@
       $name eq 'mod_perl.c' ? 0 : 1;
   }
   
  -sub configure_startup_pl {
  -    my $self = shift;
  -
  -    $self->SUPER::configure_startup_pl;
  -
  -    #XXX: issue for these is they need to happen after PerlSwitches
  -
  -    #XXX: this should only be done for the modperl-2.0 tests
  -    my $htdocs = $self->{vars}{documentroot};
  -    $self->postamble(<<"EOF");
  -<Perl >
  -push \@Alias, ['/perl_sections', '$htdocs'],
  -\$Location{'/perl_sections'} = {
  -	'PerlInitHandler' => 'ModPerl::Test::add_config',
  -	'AuthType' => 'Basic',
  -	'AuthName' => 'PerlSection',
  -	'PerlAuthenHandler' => 'TestHooks::authen',
  -	};
  -</Perl>
  -EOF
  -
  -    #XXX: this should only be done for the modperl-2.0 tests
  -    $self->postamble(<<'EOF');
  -PerlLoadModule TestDirective::loadmodule
  -
  -MyTest one two
  -ServerTest per-server
  -
  -<Location /TestDirective::loadmodule>
  -    MyOtherTest value
  -</Location>
  -EOF
  -
  -	#XXX: this should only be done for the modperl-2.0 tests
  -	$self->postamble(<<'EOF');
  -	Perl $TestDirective::perl::worked="yes";
  -EOF
  -
  -    #XXX: this should only be done for the modperl-2.0 tests
  -    $self->postamble(<<'EOF');
  -=pod
  -This is some pod data
  -=over apache
  -PerlSetVar TestDirective__pod_over_worked yes
  -=back
  -This is some more pod
  -=cut
  -PerlSetVar TestDirective__pod_cut_worked yes
  -EOF
  -    
  -}
  -
   1;
   
  
  
  
  1.70      +4 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- Changes	2 Dec 2002 16:11:47 -0000	1.69
  +++ Changes	2 Dec 2002 16:22:09 -0000	1.70
  @@ -10,6 +10,10 @@
   
   =item 1.99_08-dev
   
  +Move the custom mod_perl 2.0 configuration bits out of the
  +ModPerl::TestRun, where they don't belong, into a special config file
  +which is included at the very end of httpd.conf [Stas Bekman]
  +
   Extend Apache::Test to allow extra configuration files to be included
   at the very end of httpd.conf, when everything was loaded and
   configured [Stas Bekman]
  
  
  

Mime
View raw message