cvs commit: modperl/src/modules/perl mod_perl.h perl_config.c

[cholet]

cholet      00/07/24 06:38:36

  Modified:    src/modules/perl mod_perl.h perl_config.c
  Log:
  PerlSetupEnv merge fix, take 2
  
  Revision  Changes    Path
  1.101     +1 -1      modperl/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.h,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- mod_perl.h        2000/07/24 13:33:00     1.100
  +++ mod_perl.h        2000/07/24 13:38:34     1.101
  @@ -442,7 +442,7 @@
   #define MP_ENV_off(d)    (d->flags  &= ~MPf_ENV)
   #endif
   
  -#define MP_ENV(d)       (d->SetupEnv == MPf_On)
  +#define MP_ENV(d)       (d->SetupEnv != MPf_Off)
   #define MP_ENV_on(d)    (d->SetupEnv = MPf_On)
   #define MP_ENV_off(d)   (d->SetupEnv = MPf_Off)
   
  
  
  
  1.100     +1 -1      modperl/src/modules/perl/perl_config.c
  
  Index: perl_config.c
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/perl_config.c,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- perl_config.c     2000/07/24 13:33:01     1.99
  +++ perl_config.c     2000/07/24 13:38:34     1.100
  @@ -298,7 +298,7 @@
       cld->env  = make_table(p, 5); 
       cld->flags = MPf_ENV;
       cld->SendHeader = MPf_None;
  -    cld->SetupEnv = MPf_On;
  +    cld->SetupEnv = MPf_None;
       cld->PerlHandler = PERL_CMD_INIT;
       PERL_DISPATCH_CREATE(cld);
       PERL_AUTHEN_CREATE(cld);