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 st...@apache.org on 2003/05/02 03:35:04 UTC

cvs commit: modperl-2.0 Changes

stas        2003/05/01 18:35:03

  Modified:    src/modules/perl mod_perl.c
               .        Changes
  Log:
  PerlRequire entried should be executed before PerlModule entries in
  VirtualHost containers, just like in the base server
  
  Revision  Changes    Path
  1.170     +3 -2      modperl-2.0/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
  retrieving revision 1.169
  retrieving revision 1.170
  diff -u -r1.169 -r1.170
  --- mod_perl.c	16 Apr 2003 03:03:35 -0000	1.169
  +++ mod_perl.c	2 May 2003 01:35:03 -0000	1.170
  @@ -297,10 +297,11 @@
           }   
   #endif
           
  -        if (!modperl_config_apply_PerlModule(s, scfg, perl, p)) {
  +        if (!modperl_config_apply_PerlRequire(s, scfg, perl, p)) {
               return HTTP_INTERNAL_SERVER_ERROR;
           }
  -        if (!modperl_config_apply_PerlRequire(s, scfg, perl, p)) {
  +
  +        if (!modperl_config_apply_PerlModule(s, scfg, perl, p)) {
               return HTTP_INTERNAL_SERVER_ERROR;
           }
       }
  
  
  
  1.182     +2 -1      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.181
  retrieving revision 1.182
  diff -u -r1.181 -r1.182
  --- Changes	28 Apr 2003 02:34:25 -0000	1.181
  +++ Changes	2 May 2003 01:35:03 -0000	1.182
  @@ -12,7 +12,8 @@
   
   =item 1.99_10-dev
   
  -
  +PerlRequire entried should be executed before PerlModule entries in
  +VirtualHost containers, just like in the base server [Stas]
   
   =item 1.99_09 - April 28, 2003