You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1999/05/18 03:45:01 UTC

cvs commit: modperl/src/modules/perl perl_util.c

dougm       99/05/17 18:45:01

  Modified:    .        Changes ToDo
               src/modules/perl perl_util.c
  Log:
  dont use DEFAULT_PATH if r->subprocess_env->{PATH} is already set
  
  Revision  Changes    Path
  1.288     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.287
  retrieving revision 1.288
  diff -u -r1.287 -r1.288
  --- Changes	1999/05/18 01:24:27	1.287
  +++ Changes	1999/05/18 01:44:59	1.288
  @@ -8,6 +8,9 @@
   
   =item 1.19_01-dev
   
  +dont use DEFAULT_PATH if r->subprocess_env->{PATH} is already set
  +[Bertrand Demiddelaer <wi...@hotmail.com>]
  +
   ensure perl_setup_env() is called just once per-request
   [Salvador Ortiz Garcia <so...@msg.com.mx>]
   
  
  
  
  1.177     +1 -9      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /export/home/cvs/modperl/ToDo,v
  retrieving revision 1.176
  retrieving revision 1.177
  diff -u -r1.176 -r1.177
  --- ToDo	1999/05/17 19:08:13	1.176
  +++ ToDo	1999/05/18 01:44:59	1.177
  @@ -5,23 +5,15 @@
   
   - Paul J. Reder's aix/dso port
   
  -- modules/file #6
  +- modules/file + -T
   
  -- Salvador's patch to avoid %ENV setup on subrequests
  -
   - <Perl> patch for *Match from Craig Lien <li...@rrnet.com>
   
   - win32 table patch Trung Tran-Duc <tr...@prague.ixos.cz>
   
  -- PATH patch Bertrand Demiddelaer <wi...@hotmail.com>
  -
   - sfio patches John Hughes <jo...@calva.com>
   
  -- $r->set_handlers(PerlAuthenHandler => undef) stomps other config!?
  -
   - fix $Apache::Server::Starting under dso
  -
  -- PerlSetEnv gets lost?
   
   - Apache::Include->virtual should return run() value, not status()
   
  
  
  
  1.28      +8 -4      modperl/src/modules/perl/perl_util.c
  
  Index: perl_util.c
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/perl_util.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- perl_util.c	1999/01/28 17:55:50	1.27
  +++ perl_util.c	1999/05/18 01:45:00	1.28
  @@ -584,10 +584,14 @@
       add_common_vars(r); 
       add_cgi_vars(r); 
   
  -    if ((tz = getenv("TZ")) != NULL)
  -	table_set(envtab, "TZ", tz);
  -
  -    table_set(envtab, "PATH", DEFAULT_PATH);
  +    if (!table_get(envtab, "TZ")) {
  +	if ((tz = getenv("TZ")) != NULL) {
  +	    table_set(envtab, "TZ", tz);
  +	}
  +    }
  +    if (!table_get(envtab, "PATH")) {
  +	table_set(envtab, "PATH", DEFAULT_PATH);
  +    }
       table_set(envtab, "GATEWAY_INTERFACE", PERL_GATEWAY_INTERFACE);
   
       return table_elts(envtab);