Return-Path: <dougm@locus.apache.org>
Mailing-List: contact modperl-cvs-help@apache.org; run by ezmlm
Delivered-To: mailing list modperl-cvs@apache.org
Received: (qmail 42963 invoked by uid 1066); 27 Apr 2000 22:29:47 -0000
Date: 27 Apr 2000 22:29:47 -0000
Message-ID: <20000427222947.42962.qmail@locus.apache.org>
From: dougm@locus.apache.org
To: modperl-cvs@apache.org
Subject: cvs commit: modperl/Apache Apache.pm

dougm       00/04/27 15:29:47

  Modified:    .        Changes
               Apache   Apache.pm
  Log:
  fix Apache->httpd_conf
  
  Revision  Changes    Path
  1.475     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.474
  retrieving revision 1.475
  diff -u -r1.474 -r1.475
  --- Changes	2000/04/21 19:37:45	1.474
  +++ Changes	2000/04/27 22:29:46	1.475
  @@ -10,6 +10,8 @@
   
   =item 1.23_01-dev
   
  +fix Apache->httpd_conf, thanks to Will Trillich for the spot
  +
   fixed 'make clean' to remove FILES => passed to MakeMaker
   
   =item 1.23 - April 20, 2000
  
  
  
  1.47      +6 -8      modperl/Apache/Apache.pm
  
  Index: Apache.pm
  ===================================================================
  RCS file: /home/cvs/modperl/Apache/Apache.pm,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Apache.pm	2000/04/05 04:55:55	1.46
  +++ Apache.pm	2000/04/27 22:29:47	1.47
  @@ -24,16 +24,14 @@
       __PACKAGE__->mod_perl::boot($VERSION);
   }
   
  -if($ENV{MOD_PERL} && perl_hook("Sections")) {
  +BEGIN {
       *Apache::ReadConfig:: = \%ApacheReadConfig::;
  +}
   
  -    if(Apache::Constants::MODULE_MAGIC_NUMBER() >= 19971026) {
  -	*Apache::httpd_conf = sub {
  -	    shift;
  -	    push @Apache::ReadConfig::PerlConfig,
  -	    map "$_\n", @_;
  -	};
  -    }
  +sub httpd_conf {
  +    shift;
  +    push @Apache::ReadConfig::PerlConfig,
  +      map "$_\n", @_;
   }
   
   sub parse_args {