perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@hyperreal.org
Subject cvs commit: modperl/t/net/perl file.pl
Date Wed, 07 Apr 1999 03:34:40 GMT
dougm       99/04/06 20:34:39

  Modified:    .        Changes ToDo
               lib/Apache test.pm
               src/modules/perl Apache.xs
               t/docs   startup.pl
               t/modules request.t
               t/net/perl file.pl
  Log:
  Apache::Request upload tests are skipped #ifdef USE_SFIO
  
  $r->send_fd() will croak() #ifdef USE_SFIO
  
  Revision  Changes    Path
  1.275     +4 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.274
  retrieving revision 1.275
  diff -u -r1.274 -r1.275
  --- Changes	1999/04/06 23:56:32	1.274
  +++ Changes	1999/04/07 03:34:28	1.275
  @@ -8,6 +8,10 @@
   
   =item 1.18_01-dev
   
  +Apache::Request upload tests are skipped #ifdef USE_SFIO 
  +
  +$r->send_fd() will croak() #ifdef USE_SFIO
  +
   added $r->mtime method [Andreas J. Koenig <andreas.koenig@anima.de>]
   
   fix so version info is not inserted too early (i.e. before Apache/x.x.x)
  
  
  
  1.172     +0 -2      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /home/cvs/modperl/ToDo,v
  retrieving revision 1.171
  retrieving revision 1.172
  diff -u -r1.171 -r1.172
  --- ToDo	1999/04/06 23:56:32	1.171
  +++ ToDo	1999/04/07 03:34:29	1.172
  @@ -7,8 +7,6 @@
   
   - $r->set_handlers(PerlAuthenHandler => undef) stomps other config!?
   
  -- how to manipulate order of handlers (not just Perl*Handlers)
  -
   - %Files doesnt work, nor does @DirectoryIndex outside of %Location
   
   - -Duseperlio w/o -Dusesfio, #ifndef PERLIO_IS_STDIO, #define PERLIO_IS_STDIO
  
  
  
  1.11      +3 -2      modperl/lib/Apache/test.pm
  
  Index: test.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/test.pm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- test.pm	1998/12/14 23:34:00	1.10
  +++ test.pm	1999/04/07 03:34:33	1.11
  @@ -1,14 +1,14 @@
   package Apache::test;
   
   use strict;
  -use vars qw(@EXPORT $USE_THREAD $PERL_DIR);
  +use vars qw(@EXPORT $USE_THREAD $USE_SFIO $PERL_DIR);
   use Exporter ();
   use Config;
   use FileHandle ();
   *import = \&Exporter::import;
   
   @EXPORT = qw(test fetch simple_fetch have_module skip_test 
  -	     $USE_THREAD $PERL_DIR WIN32 grab run_test); 
  +	     $USE_THREAD $USE_SFIO $PERL_DIR WIN32 grab run_test); 
   
   BEGIN { 
       if(not $ENV{MOD_PERL}) {
  @@ -20,6 +20,7 @@
   $PERL_DIR = $ENV{PERL_DIR} if exists $ENV{PERL_DIR};
   
   $USE_THREAD = ($Config{extensions} =~ /Thread/) || $Config{usethreads};
  +$USE_SFIO = ($Config{'usesfio'} eq 'true');
   
   my $Is_Win32 = ($^O eq "MSWin32");
   sub WIN32 () { $Is_Win32 };
  
  
  
  1.74      +10 -0     modperl/src/modules/perl/Apache.xs
  
  Index: Apache.xs
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/Apache.xs,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- Apache.xs	1999/03/26 19:59:45	1.73
  +++ Apache.xs	1999/04/07 03:34:34	1.74
  @@ -54,6 +54,16 @@
   #include "mod_perl.h"
   #include "mod_perl_xs.h"
   
  +
  +#ifdef USE_SFIO
  +#undef send_fd_length    
  +static long send_fd_length(FILE *f, request_rec *r, long length)
  +{
  +    croak("Apache::send_fd() not supported with sfio");
  +    return 0;
  +}
  +#endif
  +
   #if defined(PERL_STACKED_HANDLERS) && defined(PERL_GET_SET_HANDLERS)
   
   #define PER_DIR_CONFIG 1
  
  
  
  1.36      +1 -1      modperl/t/docs/startup.pl
  
  Index: startup.pl
  ===================================================================
  RCS file: /home/cvs/modperl/t/docs/startup.pl,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- startup.pl	1999/03/26 20:23:07	1.35
  +++ startup.pl	1999/04/07 03:34:35	1.36
  @@ -20,7 +20,7 @@
   	warn "GV alias broken\n";
   }
   
  -if (-e "t/docs/local.pl") {
  +if ($] >= 5.005 and -e "t/docs/local.pl") {
       eval {
   	require "local.pl"; 
       }; $@='' if $@;
  
  
  
  1.6       +6 -1      modperl/t/modules/request.t
  
  Index: request.t
  ===================================================================
  RCS file: /home/cvs/modperl/t/modules/request.t,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- request.t	1999/01/19 21:26:10	1.5
  +++ request.t	1999/04/07 03:34:37	1.6
  @@ -27,8 +27,11 @@
   
   my $test_pods = $ENV{UPLOAD_PODS} || ($Is_dougm ? 20 : 3);
   my $tests = 2;
  -$tests += ($test_pods * 2) + (@binary * 2);
   
  +unless ($USE_SFIO) {
  +    $tests += ($test_pods * 2) + (@binary * 2);
  +}
  +
   print "1..$tests\n";
   my $i = 0;
   my $ua = LWP::UserAgent->new;
  @@ -38,6 +41,8 @@
   for my $cv (\&post_test, \&get_test) {
       $cv->();
   }
  +
  +exit(0) if $USE_SFIO;
   
   if ($Is_dougm) {
       for (@binary) {
  
  
  
  1.5       +2 -2      modperl/t/net/perl/file.pl
  
  Index: file.pl
  ===================================================================
  RCS file: /home/cvs/modperl/t/net/perl/file.pl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- file.pl	1999/04/06 23:56:35	1.4
  +++ file.pl	1999/04/07 03:34:39	1.5
  @@ -10,7 +10,7 @@
   }
   
   require Apache::File;
  -print "1..5\n";
  +print "1..6\n";
   my $fh = Apache::File->new;
   my $i = 0;
   test ++$i, $fh;
  @@ -23,7 +23,7 @@
   #print $tmp "ok $i\n";
   #seek $tmp, 0, 0;
   #print scalar(<$tmp>);
  -#test ++$i, Apache::File->tmpfile;
  +test ++$i, Apache::File->tmpfile;
   
   $r->update_mtime;
   test ++$i, $r->mtime;
  
  
  

Mime
View raw message