Mailing-List: contact modperl-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@perl.apache.org
Date: 19 Nov 2001 23:32:00 -0000
Message-ID: <20011119233200.41017.qmail@icarus.apache.org>
From: dougm@apache.org
To: modperl-2.0-cvs@apache.org
Subject: cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm

dougm       01/11/19 15:32:00

  Modified:    xs/Apache/ServerUtil Apache__ServerUtil.h
               xs/maps  apache_functions.map
               xs/tables/current/ModPerl FunctionTable.pm
  Log:
  fix Apache::server_root_relative arguments to be the same as apache api
  
  use modperl_sv2pool() to find the apr_pool_t *
  
  Revision  Changes    Path
  1.7       +3 -11     modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h
  
  Index: Apache__ServerUtil.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Apache__ServerUtil.h	2001/11/12 22:42:28	1.6
  +++ Apache__ServerUtil.h	2001/11/19 23:32:00	1.7
  @@ -43,18 +43,10 @@
   modperl_global_get_server_rec()
   
   static MP_INLINE char *mpxs_ap_server_root_relative(pTHX_
  -                                                    const char *fname,
  -                                                    apr_pool_t *p)
  +                                                    SV *sv,
  +                                                    const char *fname)
   {
  -    if (!fname) {
  -        fname = "";
  -    }
  +    apr_pool_t *p = modperl_sv2pool(aTHX_ sv);
   
  -    if (!p) {
  -        /* XXX: should do something better if called at request time
  -         * without a pool
  -         */
  -        p = modperl_global_get_pconf();
  -    }
       return ap_server_root_relative(p, fname);
   }
  
  
  
  1.38      +1 -1      modperl-2.0/xs/maps/apache_functions.map
  
  Index: apache_functions.map
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- apache_functions.map	2001/11/12 22:42:28	1.37
  +++ apache_functions.map	2001/11/19 23:32:00	1.38
  @@ -152,7 +152,7 @@
    ap_get_server_built
    ap_get_server_version
    ap_psignature | | r,prefix
  - ap_server_root_relative | mpxs_ | fname=NULL, p=NULL
  + ap_server_root_relative | mpxs_ | SV *:p, fname=""
   
   MODULE=Apache::Connection   PACKAGE=guess
    ap_get_remote_host
  
  
  
  1.52      +5 -5      modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
  
  Index: FunctionTable.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- FunctionTable.pm	2001/11/19 22:40:12	1.51
  +++ FunctionTable.pm	2001/11/19 23:32:00	1.52
  @@ -2,7 +2,7 @@
   
   # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   # ! WARNING: generated by ModPerl::ParseSource/0.01
  -# !          Mon Nov 19 14:57:48 2001
  +# !          Mon Nov 19 15:11:46 2001
   # !          do NOT edit, any changes will be lost !
   # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   
  @@ -4827,12 +4827,12 @@
           'name' => 'my_perl'
         },
         {
  -        'type' => 'const char *',
  -        'name' => 'fname'
  +        'type' => 'SV *',
  +        'name' => 'sv'
         },
         {
  -        'type' => 'apr_pool_t *',
  -        'name' => 'p'
  +        'type' => 'const char *',
  +        'name' => 'fname'
         }
       ]
     },