cvs commit: modperl-2.0/src/modules/perl modperl_util.c

[stas]

stas        02/01/29 01:50:39

  Modified:    src/modules/perl modperl_util.c
  Log:
  - forgot to add that if modperl_tls_get_request_rec fails (which can only
  succeed inside request with 'PerlOptions +GlobalRequest', we retun
  modperl_global_get_pconf()
  
  Revision  Changes    Path
  1.37      +6 -2      modperl-2.0/src/modules/perl/modperl_util.c
  
  Index: modperl_util.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- modperl_util.c    29 Jan 2002 05:54:20 -0000      1.36
  +++ modperl_util.c    29 Jan 2002 09:50:39 -0000      1.37
  @@ -170,7 +170,11 @@
       char *classname = NULL;
       IV ptr = 0;
   
  -    /* get the pool from the current request if applicable */
  +    /*
  +     * if inside request and 'PerlOptions +GlobalRequest' for this interp,
  +     * get the pool from the current request
  +     * else return the global pool
  +     */
       if (obj == &PL_sv_undef) {
           request_rec *r = NULL;
           (void)modperl_tls_get_request_rec(&r);
  @@ -179,7 +183,7 @@
               return r->pool;
           }
   
  -        return NULL;
  +        return modperl_global_get_pconf();
       }
       
       if ((SvROK(obj) && (SvTYPE(SvRV(obj)) == SVt_PVMG))) {