dougm 01/11/12 14:42:28
Modified: t/response/TestAPI server_util.pm
xs/Apache/ServerUtil Apache__ServerUtil.h
xs/maps apache_functions.map
Log:
default Apache::server_root_relative() fname to ""
Revision Changes Path
1.2 +9 -5 modperl-2.0/t/response/TestAPI/server_util.pm
Index: server_util.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/server_util.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server_util.pm 2001/11/12 22:39:04 1.1
+++ server_util.pm 2001/11/12 22:42:28 1.2
@@ -14,15 +14,19 @@
my $s = $r->server;
- plan $r, tests => 2;
+ plan $r, tests => 3;
- my $t_dir = Apache::server_root_relative('conf', $r->pool);
+ my $dir = Apache::server_root_relative('conf', $r->pool);
- ok -d $t_dir;
+ ok -d $dir;
- $t_dir = Apache::server_root_relative('logs');
+ $dir = Apache::server_root_relative('logs');
- ok -d $t_dir;
+ ok -d $dir;
+
+ $dir = Apache::server_root_relative();
+
+ ok -d $dir;
Apache::OK;
}
1.6 +4 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Apache__ServerUtil.h 2001/11/12 22:38:27 1.5
+++ Apache__ServerUtil.h 2001/11/12 22:42:28 1.6
@@ -46,6 +46,10 @@
const char *fname,
apr_pool_t *p)
{
+ if (!fname) {
+ fname = "";
+ }
+
if (!p) {
/* XXX: should do something better if called at request time
* without a pool
1.37 +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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- apache_functions.map 2001/11/12 22:38:27 1.36
+++ apache_functions.map 2001/11/12 22:42:28 1.37
@@ -152,7 +152,7 @@
ap_get_server_built
ap_get_server_version
ap_psignature | | r,prefix
- ap_server_root_relative | mpxs_ | fname, p=NULL
+ ap_server_root_relative | mpxs_ | fname=NULL, p=NULL
MODULE=Apache::Connection PACKAGE=guess
ap_get_remote_host
