dougm 01/11/12 14:38:28
Modified: xs/Apache/ServerUtil Apache__ServerUtil.h
xs/maps apache_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
switch order of Apache::server_root_relative args
default pool to the server startup pool
Revision Changes Path
1.5 +13 -0 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Apache__ServerUtil.h 2001/11/07 03:39:08 1.4
+++ Apache__ServerUtil.h 2001/11/12 22:38:27 1.5
@@ -41,3 +41,16 @@
#define mpxs_Apache_server(classname) \
modperl_global_get_server_rec()
+
+static MP_INLINE char *mpxs_ap_server_root_relative(pTHX_
+ const char *fname,
+ apr_pool_t *p)
+{
+ 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.36 +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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- apache_functions.map 2001/11/06 18:41:46 1.35
+++ apache_functions.map 2001/11/12 22:38:27 1.36
@@ -152,7 +152,7 @@
ap_get_server_built
ap_get_server_version
ap_psignature | | r,prefix
- ap_server_root_relative
+ ap_server_root_relative | mpxs_ | fname, p=NULL
MODULE=Apache::Connection PACKAGE=guess
ap_get_remote_host
1.47 +23 -1 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- FunctionTable.pm 2001/11/07 04:03:07 1.46
+++ FunctionTable.pm 2001/11/12 22:38:27 1.47
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Tue Nov 6 19:57:54 2001
+# ! Mon Nov 12 14:44:40 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -4698,6 +4698,28 @@
{
'type' => 'SV **',
'name' => 'sp'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'char *',
+ 'name' => 'mpxs_ap_server_root_relative',
+ 'attr' => [
+ 'static',
+ '__inline__'
+ ],
+ 'args' => [
+ {
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
+ 'type' => 'const char *',
+ 'name' => 'fname'
+ },
+ {
+ 'type' => 'apr_pool_t *',
+ 'name' => 'p'
}
]
},
