Date: 1 Feb 1999 05:42:00 -0000
Message-ID: <19990201054200.27834.qmail@hyperreal.org>
From: dougm@hyperreal.org
To: modperl-cvs@hyperreal.org
Subject: cvs commit: modperl/src/modules/perl mod_perl.c
Sender: modperl-cvs-owner@apache.org
Precedence: bulk
Reply-To: modperl-cvs@apache.org

dougm       99/01/31 21:42:00

  Modified:    .        Changes
               src/modules/perl mod_perl.c
  Log:
  make sure per-dir PerlSetEnv happens after defaults are set (e.g. PATH)
  
  Revision  Changes    Path
  1.263     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.262
  retrieving revision 1.263
  diff -u -r1.262 -r1.263
  --- Changes	1999/02/01 05:40:27	1.262
  +++ Changes	1999/02/01 05:41:58	1.263
  @@ -8,6 +8,8 @@
   
   =item 1.18_01-dev
   
  +make sure per-dir PerlSetEnv happens after defaults are set (e.g. PATH)
  +
   cure core dump with 5.005_03-threads
   
   ensure mod_perl/x.xx component is not added before Apache/x.x.x
  
  
  
  1.80      +3 -3      modperl/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- mod_perl.c	1999/02/01 05:40:28	1.79
  +++ mod_perl.c	1999/02/01 05:41:59	1.80
  @@ -1217,9 +1217,6 @@
       dPPDIR;
       dPPREQ;
       
  -    /* PerlSetEnv */
  -    mod_perl_dir_env(cld);
  -
       /* PerlSendHeader */
       if(MP_SENDHDR(cld)) {
   	MP_SENTHDR_off(cld);
  @@ -1245,6 +1242,9 @@
       else if (cfg->setup_env && MP_ENV(cld)) { 
   	perl_setup_env(r);
       }
  +
  +    /* PerlSetEnv */
  +    mod_perl_dir_env(cld);
   
       if(callbacks_this_request++ > 0) return;