perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@locus.apache.org
Subject cvs commit: modperl Makefile.PL Changes ToDo
Date Tue, 03 Oct 2000 14:17:24 GMT
dougm       00/10/03 07:17:23

  Modified:    .        Makefile.PL Changes ToDo
  Log:
  fixups for libapreq
  
  Revision  Changes    Path
  1.170     +30 -24    modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.169
  retrieving revision 1.170
  diff -u -r1.169 -r1.170
  --- Makefile.PL	2000/09/27 17:55:21	1.169
  +++ Makefile.PL	2000/10/03 14:17:22	1.170
  @@ -865,6 +865,8 @@
       cp "t/net/config.pl.dist", "t/net/config.pl";
   }
   
  +init_config_pl() if $Is_Win32;
  +
   write_my_config($APACHE_SRC);
   
   unless($Is_Win32 or -e "t/conf/httpd.conf" or ($NO_HTTPD && !$PREP_HTTPD)) {
  @@ -873,6 +875,32 @@
   
   init_tests_and_config() if $USE_APXS;
   
  +sub init_config_pl {
  +    my $mmn = magic_number($APACHE_SRC) || 0;
  +
  +    my $hf = FileHandle->new(">>t/net/config.pl") or 
  +      die "can't open t/net/config.pl $!";
  +
  +    my $apaci_cfg = APACI->init;
  +
  +    my($k,$v);
  +    my(%all) = %callback_hooks;
  +    while (($k,$v) = each %experimental) {
  +        $all{$k} = ($experimental{$k} > 1) ? 1 : 0;
  +    }
  +    print $hf "%callback_hooks = (\n";
  +    while (($k,$v) = each %all) {
  +        print $hf "   $k => $v,\n";
  +        my $yes_no = $v ? "yes" : "no";
  +        print $apaci_cfg "$k = $yes_no\n" if $apaci_cfg;
  +    }
  +    print $hf "   MMN => $mmn,\n";
  +    print $hf "   USE_DSO => 1,\n" if $USE_DSO;
  +    print $hf ");\n1;\n";
  +    $hf->close;
  +    $apaci_cfg->close if $apaci_cfg;
  +}
  +
   sub init_tests_and_config {
       local *FH;
       open FH, ">t/conf/dev-null";
  @@ -913,31 +941,8 @@
   	    iedit "t/conf/httpd.conf", "s/^#(PerlOpmask)/\$1/";
   	}
       }
  -    {
  -	my $mmn = magic_number($APACHE_SRC) || 0;
  -
  -	my $hf = FileHandle->new(">>t/net/config.pl") or 
  -	    die "can't open t/net/config.pl $!";
  -
  -	my $apaci_cfg = APACI->init;
   
  -	my($k,$v);
  -	my(%all) = %callback_hooks;
  -	while(($k,$v) = each %experimental) {
  -	    $all{$k} = ($experimental{$k} > 1) ? 1 : 0;
  -	}
  -	print $hf "%callback_hooks = (\n";
  -	while(($k,$v) = each %all) {
  -	    print $hf "   $k => $v,\n";
  -	    my $yes_no = $v ? "yes" : "no";
  -	    print $apaci_cfg "$k = $yes_no\n" if $apaci_cfg;
  -	}
  -        print $hf "   MMN => $mmn,\n";
  -	print $hf "   USE_DSO => 1,\n" if $USE_DSO;
  -	print $hf ");\n1;\n";
  -	$hf->close;
  -	$apaci_cfg->close if $apaci_cfg;
  -    }
  +    init_config_pl();
   
       if($USE_APACI and not $PREP_HTTPD and not $USE_APXS) {
   	my $shrpenv = $Config{shrpenv} || "";
  @@ -1962,6 +1967,7 @@
   }
   
   sub APACI::init {
  +    return undef if $Is_Win32;
       my $lib_cfg;
       if($USE_APXS) {
   	$lib_cfg = "apaci/mod_perl.config";
  
  
  
  1.542     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.541
  retrieving revision 1.542
  diff -u -r1.541 -r1.542
  --- Changes	2000/09/29 20:33:51	1.541
  +++ Changes	2000/10/03 14:17:22	1.542
  @@ -10,6 +10,9 @@
   
   =item 1.24_01-dev
   
  +config/test fixups for libapreq/win32
  +[Randy Kobes <randy@theoryx5.uwinnipeg.ca>]
  +
   skip modules/ssi test if mod_include is not installed
   
   Apache::test enhancements
  
  
  
  1.264     +0 -2      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /home/cvs/modperl/ToDo,v
  retrieving revision 1.263
  retrieving revision 1.264
  diff -u -r1.263 -r1.264
  --- ToDo	2000/09/29 20:33:50	1.263
  +++ ToDo	2000/10/03 14:17:22	1.264
  @@ -9,8 +9,6 @@
     and make it more clear that Apache::Status should not be used in a
     production environment, as it adds quite a bit of bloat
   
  -- changes for libapreq+win32 [Jiho Hahm <jhahm@zing.com>]
  -
   - segfaults with DBI->connect (mysql), reported that downgrade to
     1.21_03 cures
   
  
  
  

Mime
View raw message