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 Tue, 08 Apr 2003 02:05:34 GMT
stas        2003/04/07 19:05:34

  Modified:    xs/APR/PerlIO PerlIO.pm
               t/response/TestAPR perlio.pm
               t/response/TestApache subprocess.pm
               .        Changes
  Log:
  Add a constant APR::PerlIO::PERLIO_LAYERS_ARE_ENABLED and use it in
  tests
  
  Revision  Changes    Path
  1.2       +4 -1      modperl-2.0/xs/APR/PerlIO/PerlIO.pm
  
  Index: PerlIO.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/APR/PerlIO/PerlIO.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PerlIO.pm	17 Dec 2001 16:20:27 -0000	1.1
  +++ PerlIO.pm	8 Apr 2003 02:05:34 -0000	1.2
  @@ -4,9 +4,12 @@
   
   our $VERSION = '0.01';
   
  +# The PerlIO layer is available only since 5.8.0 (5.7.2@13534)
  +use Config;
  +use constant PERLIO_LAYERS_ARE_ENABLED => $Config{useperlio} && $] >= 5.00703;
  +
   use APR::XSLoader ();
   APR::XSLoader::load __PACKAGE__;
   
  -# XXX: The PerlIO layer is available only since 5.8.0 (5.7.2 p13534)
   
   1;
  
  
  
  1.17      +5 -1      modperl-2.0/t/response/TestAPR/perlio.pm
  
  Index: perlio.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/perlio.pm,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- perlio.pm	8 Apr 2003 01:19:58 -0000	1.16
  +++ perlio.pm	8 Apr 2003 02:05:34 -0000	1.17
  @@ -23,7 +23,11 @@
   
       $tests += $lfs_tests unless LARGE_FILES_CONFLICT;
   
  -    plan $r, tests => $tests, have 'APR::PerlIO';
  +    eval { require APR::PerlIO };
  +
  +    plan $r, tests => $tests, have {
  +        "This Perl build doesn't support PerlIO layers" =>
  +            APR::PerlIO::PERLIO_LAYERS_ARE_ENABLED() };
   
       my $vars = Apache::Test::config()->{vars};
       my $dir  = catfile $vars->{documentroot}, "perlio";
  
  
  
  1.13      +1 -3      modperl-2.0/t/response/TestApache/subprocess.pm
  
  Index: subprocess.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestApache/subprocess.pm,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- subprocess.pm	3 Feb 2003 00:24:22 -0000	1.12
  +++ subprocess.pm	8 Apr 2003 02:05:34 -0000	1.13
  @@ -42,8 +42,6 @@
   
       plan $r, tests => 4, have qw(APR::PerlIO Apache::SubProcess);
   
  -    eval { require Apache::SubProcess };
  -
       my $target_dir = catfile $vars->{documentroot}, "util";
   
       {
  @@ -149,7 +147,7 @@
       #
       # btw: we use perlIO only for perl 5.7+
       #
  -    if (PERLIO_5_8_IS_ENABLED || $sel->can_read(10)) {
  +    if (APR::PerlIO::PERLIO_LAYERS_ARE_ENABLED() || $sel->can_read(10)) {
           @data = wantarray ? (<$fh>) : <$fh>;
       }
   
  
  
  
  1.167     +3 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.166
  retrieving revision 1.167
  diff -u -r1.166 -r1.167
  --- Changes	7 Apr 2003 23:23:24 -0000	1.166
  +++ Changes	8 Apr 2003 02:05:34 -0000	1.167
  @@ -10,6 +10,9 @@
   
   =item 1.99_09-dev
   
  +Add a constant APR::PerlIO::PERLIO_LAYERS_ARE_ENABLED and use it in
  +tests [Stas]
  +
   Require perl 5.8 or higher when building mod_perl on OSes requiring
   ithreads (e.g., win32), since 5.6.x ithreads aren't good. [Stas]
   
  
  
  

Mime
View raw message