geoff 2004/01/19 10:47:32
Modified: lib/Apache compat.pm
t/response/TestAPI server_const.pm server_util.pm
xs/Apache/ServerUtil Apache__ServerUtil.h
xs/maps apache_functions.map
Log:
Apache::server_root is now Apache::Server::server_root
Revision Changes Path
1.99 +1 -1 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- compat.pm 19 Jan 2004 18:25:14 -0000 1.98
+++ compat.pm 19 Jan 2004 18:47:32 -0000 1.99
@@ -224,7 +224,7 @@
package Apache::Server;
# XXX: is that good enough? see modperl/src/modules/perl/mod_perl.c:367
-our $CWD = Apache::server_root;
+our $CWD = Apache::Server::server_root;
our $AddPerlVersion = 1;
1.2 +1 -1 modperl-2.0/t/response/TestAPI/server_const.pm
Index: server_const.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/server_const.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server_const.pm 19 Jan 2004 18:35:26 -0000 1.1
+++ server_const.pm 19 Jan 2004 18:47:32 -0000 1.2
@@ -29,7 +29,7 @@
# test Apache::Server constant subroutines
ok t_cmp(canonpath($root),
- canonpath(Apache::server_root),
+ canonpath(Apache::Server::server_root),
'Apache::Server::server_root()');
1.8 +3 -3 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- server_util.pm 19 Jan 2004 16:45:47 -0000 1.7
+++ server_util.pm 19 Jan 2004 18:47:32 -0000 1.8
@@ -97,10 +97,10 @@
canonpath(Apache::server_root_relative($r->pool)),
'Apache::server_root_relative($r->pool)');
- # Apache::server_root is also the ServerRoot constant
- ok t_cmp(canonpath(Apache::server_root),
+ # Apache::Server::server_root is also the ServerRoot constant
+ ok t_cmp(canonpath(Apache::Server::server_root),
canonpath($r->server_root_relative),
- 'Apache::server_root');
+ 'Apache::Server::server_root');
{
# absolute paths should resolve to themselves
1.13 +1 -1 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Apache__ServerUtil.h 19 Jan 2004 18:33:06 -0000 1.12
+++ Apache__ServerUtil.h 19 Jan 2004 18:47:32 -0000 1.13
@@ -57,7 +57,7 @@
static void mpxs_Apache__ServerUtil_BOOT(pTHX)
{
- newCONSTSUB(PL_defstash, "Apache::server_root",
+ newCONSTSUB(PL_defstash, "Apache::Server::server_root",
newSVpv(ap_server_root, 0));
newCONSTSUB(PL_defstash, "Apache::Server::get_server_built",
1.73 +1 -0 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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- apache_functions.map 19 Jan 2004 18:33:06 -0000 1.72
+++ apache_functions.map 19 Jan 2004 18:47:32 -0000 1.73
@@ -169,6 +169,7 @@
ap_method_register
~ap_get_server_built
~ap_get_server_version
+~ap_server_root
MODULE=Apache::Connection PACKAGE=guess
#XXX: thought this might be useful for protocol modules
