Return-Path: 
 <modperl-cvs-return-4129-apmail-perl-modperl-cvs-archive=perl.apache.org@perl.apache.org>
Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org
Received: (qmail 71385 invoked from network); 9 Feb 2004 22:20:57 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 9 Feb 2004 22:20:57 -0000
Received: (qmail 27049 invoked by uid 500); 9 Feb 2004 22:20:43 -0000
Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org
Received: (qmail 26993 invoked by uid 500); 9 Feb 2004 22:20:42 -0000
Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:modperl-cvs-help@perl.apache.org>
list-unsubscribe: <mailto:modperl-cvs-unsubscribe@perl.apache.org>
list-post: <mailto:modperl-cvs@perl.apache.org>
Reply-To: dev@perl.apache.org
Delivered-To: mailing list modperl-cvs@perl.apache.org
Received: (qmail 26922 invoked by uid 500); 9 Feb 2004 22:20:42 -0000
Delivered-To: apmail-modperl-2.0-cvs@apache.org
Date: 9 Feb 2004 22:20:53 -0000
Message-ID: <20040209222053.71347.qmail@minotaur.apache.org>
From: gozer@apache.org
To: modperl-2.0-cvs@apache.org
Subject: cvs commit: modperl-2.0/t/conf extra.last.conf.in perlsection.conf
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

gozer       2004/02/09 14:20:53

  Modified:    t/conf   extra.last.conf.in
  Removed:     t/conf   perlsection.conf
  Log:
  To test recursive/re-entrant <Perl> sections, autogenerate the included file
  instead of having to keep t/conf/perlsection.conf in CVS
  
  Revision  Changes    Path
  1.11      +4 -1      modperl-2.0/t/conf/extra.last.conf.in
  
  Index: extra.last.conf.in
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/conf/extra.last.conf.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- extra.last.conf.in	19 Dec 2003 01:17:32 -0000	1.10
  +++ extra.last.conf.in	9 Feb 2004 22:20:53 -0000	1.11
  @@ -31,7 +31,10 @@
   
   #Handle re-entrant <Perl> sections
   <Perl >
  -$Include = "@ServerRoot@/conf/perlsection.conf";
  +    my $file = File::Spec->catfile('@ServerRoot@', 'conf', 'perlsection.conf');
  +    my $conf = join "\n", qw(<Perl> $TestDirective::perl::Included++; </Perl>);
  +    Apache::TestUtil::t_write_file($file, $conf); 
  +    $Include = $file;
   </Perl>
   
   #Deprecated access to Apache::ReadConfig:: still works