perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: modperl-2.0/src/modules/perl modperl_interp.c
Date Sat, 23 Nov 2002 23:25:33 GMT
dougm       2002/11/23 15:25:33

  Modified:    .        Changes
               src/modules/perl modperl_interp.c
  Log:
  Submitted by:	Stephen Clouse <stephenc@theiqgroup.com>
  Reviewed by:	dougm
  fix for directive handlers within vhosts using threaded MPMs
  
  Revision  Changes    Path
  1.61      +3 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- Changes	23 Nov 2002 22:56:21 -0000	1.60
  +++ Changes	23 Nov 2002 23:25:32 -0000	1.61
  @@ -10,6 +10,9 @@
   
   =item 1.99_08-dev
   
  +fix for directive handlers within vhosts using threaded MPMs
  +[Stephen Clouse <stephenc@theiqgroup.com>]
  +
   fix <IfDefine MODPERL2> support
   
   default AuthType to Basic if not set in $r->get_basic_auth_pw()
  
  
  
  1.54      +8 -0      modperl-2.0/src/modules/perl/modperl_interp.c
  
  Index: modperl_interp.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_interp.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- modperl_interp.c	22 Oct 2002 03:56:30 -0000	1.53
  +++ modperl_interp.c	23 Nov 2002 23:25:32 -0000	1.54
  @@ -323,6 +323,14 @@
       if (scfg && (is_startup || !scfg->threaded_mpm)) {
           MP_TRACE_i(MP_FUNC, "using parent interpreter at %s\n",
                      is_startup ? "startup" : "request time (non-threaded MPM)");
  +
  +        if (!scfg->mip) {
  +            /* we get here if directive handlers are invoked
  +             * before server merge.
  +             */
  +            modperl_init_vhost(s, p, NULL);
  +        }
  +
           interp = scfg->mip->parent;
       }
       else {
  
  
  

Mime
View raw message