cvs commit: modperl/lib/Apache src.pm

[do...@postman.hyperreal.org]

dougm       98/08/25 18:47:12

  Modified:    .        Changes Makefile.PL SUPPORT
               lib/Apache src.pm
  Log:
  fix Makefile.PL and Apache::src to find MODULE_MAGIC_NUMBER in ap_mmn.h
  
  Revision  Changes    Path
  1.114     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- Changes	1998/08/25 19:10:36	1.113
  +++ Changes	1998/08/26 01:47:10	1.114
  @@ -8,6 +8,8 @@
   
   =item 1.15_01-dev
   
  +fix Makefile.PL and Apache::src to find MODULE_MAGIC_NUMBER in ap_mmn.h
  +
   if PERL_DESTRUCT_LEVEL < 0, skip perl_destruct(), etc. in perl_shutdown()
   
   add CLOSE method for tied *STD{OUT,IN}
  
  
  
  1.84      +6 -11     modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /export/home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- Makefile.PL	1998/08/10 14:59:25	1.83
  +++ Makefile.PL	1998/08/26 01:47:10	1.84
  @@ -1377,19 +1377,14 @@
       return($version.$extra);
   }
   
  +use lib "./lib";
  +use Apache::src ();
  +
   sub magic_number {
       my $d = asrc shift;
  -    return $mcache{$d} if $mcache{$d};
  -    my $fh = FileHandle->new("$d/http_config.h") or return 0;
  -    my $n;
  -    while(<$fh>) {
  -	if(s/^#define\s+MODULE_MAGIC_NUMBER\s+(\d+).*/$1/) {
  -	   chomp($n = $_);
  -	   last;
  -       }
  -    }
  -    $fh->close;
  -    return($mcache{$d} = $n);
  +    my $src = Apache::src->new;
  +    $src->dir($d);
  +    return($mcache{$d} = $src->module_magic_number);
   }
   
   sub cleanup_for_static {
  
  
  
  1.9       +1 -1      modperl/SUPPORT
  
  Index: SUPPORT
  ===================================================================
  RCS file: /export/home/cvs/modperl/SUPPORT,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SUPPORT	1998/08/11 22:14:10	1.8
  +++ SUPPORT	1998/08/26 01:47:10	1.9
  @@ -106,7 +106,7 @@
    % cd mod_perl-x.xx
    % touch /tmp/mod_perl_srm.conf
    % gdb ../apache_x.xx/src/httpd
  - (gdb) run -X -d `pwd/t'
  + (gdb) run -X -f `pwd`/t/conf/httpd.conf -d `pwd`/t
    [now make request that causes core dump]
    (gdb) bt
   
  
  
  
  1.6       +8 -2      modperl/lib/Apache/src.pm
  
  Index: src.pm
  ===================================================================
  RCS file: /export/home/cvs/modperl/lib/Apache/src.pm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- src.pm	1998/05/14 03:06:55	1.5
  +++ src.pm	1998/08/26 01:47:12	1.6
  @@ -87,10 +87,16 @@
       my $d = asrc(shift || $self->dir);
   
       #return $mcache{$d} if $mcache{$d};
  -    my $fh = IO::File->new("$d/http_config.h") or return undef;
  +    my $fh;
  +    for (qw(ap_mmn.h http_config.h)) {
  +	last if $fh = FileHandle->new("$d/$_");
  +    }
  +    return 0 unless $fh;
  +
       my $n;
  +    my $mmn_pat = join "|", qw(MODULE_MAGIC_NUMBER_MAJOR MODULE_MAGIC_NUMBER);
       while(<$fh>) {
  -	if(s/^#define\s+MODULE_MAGIC_NUMBER\s+(\d+).*/$1/) {
  +	if(s/^#define\s+($mmn_pat)\s+(\d+).*/$2/) {
   	   chomp($n = $_);
   	   last;
          }