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/internal proxy.t
Date Mon, 13 Jul 1998 14:58:10 GMT
dougm       98/07/13 07:58:09

  Modified:    .        Changes Makefile.PL apache-modlist.html
               t/internal proxy.t
  Log:
  Makefile.PL is -w clean now
  
  Revision  Changes    Path
  1.71      +1 -1      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- Changes	1998/07/13 01:55:12	1.70
  +++ Changes	1998/07/13 14:57:57	1.71
  @@ -17,7 +17,7 @@
   
   ensure Apache::Server::CWD is untainted
   
  -add support to compile with -DPERL_OBJECT (win32 + 5.004_72+)
  +add support to compile with -DPERL_OBJECT (win32 + 5.004_73+)
   
   add dir_merge support for directive handlers
   
  
  
  
  1.61      +17 -9     modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /export/home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- Makefile.PL	1998/07/13 01:55:13	1.60
  +++ Makefile.PL	1998/07/13 14:57:58	1.61
  @@ -30,7 +30,7 @@
   } if $File::Copy::VERSION < 2.0;
   
   require "./mod_perl.pm_version";
  -$VERSION = $mod_perl::VERSION;
  +$VERSION = $mod_perl::VERSION = $mod_perl::VERSION;
   
   use subs qw(_prompt iedit asrc);
   
  @@ -51,6 +51,7 @@
       readline_setup();        
   }
   
  +%Apache::MyConfig::Setup = ();
   eval 'require Apache::MyConfig' ;
   
   $APACHE_SRC_DEFAULT = $@ ? 
  @@ -385,7 +386,7 @@
   		print "cp $_ $atopdir/$_\n" if $USE_APACI;
   		my $dest = "$atopdir/$_";
   		cp $_, $dest;
  -		$mani_src{$_}++;
  +		#$mani_src{$_}++;
   	    }
   	    close MANI;
   
  @@ -455,6 +456,7 @@
   	    if $can_dash_make{asrc $adir} and $mft_map{$adir};
   	#print STDERR "(cd $adir; ./Configure${dash_make} -file $PWD/$conf)\n";
   	$cfgfile = $CONFIG ? $CONFIG : "$PWD/$conf";
  +	$dash_make ||= "";
   	system "(cd $adir && ./Configure${dash_make} -file $cfgfile)";
   
   	open FH, "$APACHE_SRC/Makefile" or 
  @@ -776,14 +778,16 @@
   
       #phooey!
       my $v = httpd_version($APACHE_SRC, 1);
  +    my $mmn = magic_number($APACHE_SRC) || 0;
   
       conf_append("LockFile /tmp/mod_perl.lock") if $v >= 121;
       conf_append("PerlChildInitHandler My::child_init") if $My::child_init;
       conf_append("PerlChildExitHandler My::child_exit") if $My::child_exit;
       conf_append("PerlTransHandler My::ProxyTest") 
       if $callback_hooks{PERL_TRANS} and 
  -    $callback_hooks{PERL_STACKED_HANDLERS} and
  -    $mmn > 19980270;
  +	$callback_hooks{PERL_STACKED_HANDLERS} and
  +	$mmn > 19980270 and
  +	defined $ENV{USER} and $ENV{USER} eq "dougm";
       conf_append(<<EOF) if $callback_hooks{PERL_STACKED_HANDLERS}; 
   <Location /chain>
   SetHandler perl-script
  @@ -1204,7 +1208,8 @@
   
   sub httpd_version {
       my($dir, $vnumber) = @_;
  -    $dir = asrc $dir;
  +    local $^W=0;
  +    $dir = asrc($dir) || "";
       if($vnumber) {
   	return $vcache{$dir} if $vcache{$dir};
       }
  @@ -1232,7 +1237,7 @@
   
   	    if($fserver eq "Apache") {
   		($server, $version) = ($fserver, $fversion);
  -		if($version == 1.2 and $frest =~ s/^b(\d+).*/$1/) {
  +		if($version eq '1.2' and $frest =~ s/^b(\d+).*/$1/) {
   		    if($frest >= 8 and is_ssl($dir)) {
   			$do_link_swap++;
   			$can_dash_make{$dir}++;
  @@ -1355,6 +1360,7 @@
   }
   
   sub readline_setup {
  +    local $^W = 0;
       eval 'use Term::ReadLine' ;
   
       if ($@ eq '') {
  @@ -1476,7 +1482,8 @@
       my $sro = 1 if $mmn >= 19970825;
   
       edit_extra_cflags($cfg);
  -
  +    $PERL_STATIC_EXTS ||= "";
  +    $libperl ||= "";
       my $ldopts = "`$^X $PWD/src/modules/perl/ldopts $PERL_STATIC_EXTS $libperl`";
       iedit $cfg,
       q{next unless /EXTRA_LIBS\s*=/;}.
  @@ -1644,7 +1651,7 @@
       unless ($Embed::ccopts) {
   	$Embed::ccopts = `$^X -MExtUtils::Embed -e ccopts`;
   
  -	if($Config{usethreads} eq "define") {
  +	if(defined $Config{usethreads} and $Config{usethreads} eq "define") {
   	    $Embed::ccopts .= " -DPERL_THREADS";
   	}
       }
  @@ -1704,7 +1711,8 @@
       }
   
       $yes_no = 'no';
  -    $yes_no = 'yes' if ($Config{usethreads} eq "define");
  +    $yes_no = 'yes' if (defined $Config{usethreads} and 
  +			$Config{usethreads} eq "define");
       print $apaci_cfg "PERL_THREADS = $yes_no\n";
   
       return $apaci_cfg;
  
  
  
  1.24      +4 -2      modperl/apache-modlist.html
  
  Index: apache-modlist.html
  ===================================================================
  RCS file: /export/home/cvs/modperl/apache-modlist.html,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- apache-modlist.html	1998/07/12 21:32:43	1.23
  +++ apache-modlist.html	1998/07/13 14:57:58	1.24
  @@ -1,13 +1,13 @@
   <html>
   <head>
   <title>The Apache/Perl Module List</title>
  -<!-- Changed by: Doug MacEachern, 12-Jul-1998 -->
  +<!-- Changed by: Doug MacEachern, 13-Jul-1998 -->
   </head>
   <body>
   <h1>The Apache/Perl Module List</h1>
   
   Maintained by <a href="mailto:dougm@pobox.com">Doug MacEachern</a>,
  -<br><i> $Revision: 1.23 $ $Date: 1998/07/12 21:32:43 $</i>
  +<br><i> $Revision: 1.24 $ $Date: 1998/07/13 14:57:58 $</i>
   
   <h3>Contents</h3>
   <a href="#intro">Introduction</a><br>
  @@ -69,6 +69,7 @@
   * PerlHandler's
   Archive		i	List archive contents			PETERSON
   ASP		i	Implement Active Server Pages		CHAMAS
  +BBS		bdpO 	BBS like System for Apache		MKOSS
   CallHandler	cdpf	Map filenames to subroutine calls	GKNOPS
   Dir		i	OO (subclassable) mod_dir replacement 	DOUGM
   Embperl		bdcf	Embed Perl in HTML			GRICHTER
  @@ -249,6 +250,7 @@
   MDORMAN	 Michael Alan Dorman  &lt;mdorman@calder.med.miami.edu&gt;
   MERGL	 Edmund Mergl &lt;E.Mergl@bawue.de&gt;
   MJS      Michael Smith &lt;mjs@iii.co.uk&gt;
  +MKOSS	 Max Kossatzmax &lt;kossatz@thing.at&gt;
   MICB  	 Malcolm Beattie &lt;mbeattie@sable.ox.ac.uk&gt;
   NJENSEN	 Neil Jensen &lt;njensen@habaneros.com&gt;
   PARKER	 Michael Parker &lt;parker@austx.tandem.com&gt;
  
  
  
  1.3       +7 -4      modperl/t/internal/proxy.t
  
  Index: proxy.t
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/internal/proxy.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- proxy.t	1998/06/02 22:58:19	1.2
  +++ proxy.t	1998/07/13 14:58:07	1.3
  @@ -1,11 +1,14 @@
   
   use Apache::test;
  -print "1..1\nok 1\n"; #hmm, this one needs more time
  -__END__
  -skip_test unless 
  +
  +unless(defined $ENV{USER} and $ENV{USER} eq "dougm" and
       $net::callback_hooks{PERL_TRANS} and 
       $net::callback_hooks{PERL_STACKED_HANDLERS} and
  -    $net::callback_hooks{MMN} > 19980270;
  +    $net::callback_hooks{MMN} > 19980270)
  +{
  +    print "1..1\nok 1\n";
  +    exit 0;
  +}
   
   my $url = "http://$net::httpserver/"."proxytest";
   my $ua = LWP::UserAgent->new;
  
  
  

Mime
View raw message