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 1998/10/26 21:53:08 UTC

cvs commit: modperl/src/modules/perl Util.xs mod_perl.h perl_util.c

dougm       98/10/26 12:53:08

  Modified:    src/modules/perl Util.xs mod_perl.h perl_util.c
  Log:
  s/util_pool/perl_get_util_pool/
  
  Revision  Changes    Path
  1.6       +1 -11     modperl/src/modules/perl/Util.xs
  
  Index: Util.xs
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/Util.xs,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Util.xs	1998/10/02 18:24:23	1.5
  +++ Util.xs	1998/10/26 20:53:06	1.6
  @@ -10,17 +10,7 @@
   #define DEFAULT_TIME_FORMAT "%a, %d %b %Y %H:%M:%S %Z"
   
   #define parsedate ap_parseHTTPdate
  - 
  -static pool *util_pool(void)
  -{
  -    request_rec *r = NULL;
  -
  -    if((r = perl_request_rec(NULL)))
  -        return r->pool;
  -    else
  -        return perl_get_startup_pool();
  -    return NULL;
  -}
  +#define util_pool() perl_get_util_pool()
   
   static SV *size_string(size_t size)
   {
  
  
  
  1.54      +1 -0      modperl/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.h,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- mod_perl.h	1998/10/03 03:33:41	1.53
  +++ mod_perl.h	1998/10/26 20:53:07	1.54
  @@ -1132,6 +1132,7 @@
   
   /* Apache.xs */
   
  +pool *perl_get_util_pool(void);
   pool *perl_get_startup_pool(void);
   server_rec *perl_get_startup_server(void);
   request_rec *sv2request_rec(SV *in, char *class, CV *cv);
  
  
  
  1.18      +11 -0     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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- perl_util.c	1998/09/17 19:16:15	1.17
  +++ perl_util.c	1998/10/26 20:53:07	1.18
  @@ -143,6 +143,17 @@
       return r;
   }
   
  +pool *perl_get_util_pool(void)
  +{
  +    request_rec *r = NULL;
  +
  +    if((r = perl_request_rec(NULL)))
  +        return r->pool;
  +    else
  +        return perl_get_startup_pool();
  +    return NULL;
  +}
  +
   pool *perl_get_startup_pool(void)
   {
       SV *sv = perl_get_sv("Apache::__POOL", FALSE);