geoff 2004/01/19 11:02:41
Modified: lib/Apache compat.pm
t/response/TestAPI server_util.pm
t/response/TestCompat apache.pm
xs/maps apache_functions.map
Log:
Apache::exists_config_define is now Apache::Server::exists_config_define
Revision Changes Path
1.100 +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.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- compat.pm 19 Jan 2004 18:47:32 -0000 1.99
+++ compat.pm 19 Jan 2004 19:02:41 -0000 1.100
@@ -268,7 +268,7 @@
sub define {
shift if @_ == 2;
- exists_config_define(@_);
+ Apache::Server::exists_config_define(@_);
}
sub log_error {
1.9 +7 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- server_util.pm 19 Jan 2004 18:47:32 -0000 1.8
+++ server_util.pm 19 Jan 2004 19:02:41 -0000 1.9
@@ -46,7 +46,7 @@
);
plan $r, tests => (scalar keys %pools) +
- (scalar keys %objects) + 9;
+ (scalar keys %objects) + 11;
# syntax - an object or pool is required
t_debug("Apache::server_root_relative() died");
@@ -111,10 +111,12 @@
"\$r->server_root_relative($dir)");
}
- {
- t_debug('registering method FOO');
- ok Apache::Server::method_register($r->server->process->pconf, 'FOO');
- }
+ t_debug('registering method FOO');
+ ok Apache::Server::method_register($r->server->process->pconf, 'FOO');
+
+ t_debug('Apache::Server::exists_config_define');
+ ok Apache::Server::exists_config_define('MODPERL2');
+ ok ! Apache::Server::exists_config_define('FOO');
Apache::OK;
}
1.9 +1 -1 modperl-2.0/t/response/TestCompat/apache.pm
Index: apache.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestCompat/apache.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apache.pm 14 Jan 2004 21:27:41 -0000 1.8
+++ apache.pm 19 Jan 2004 19:02:41 -0000 1.9
@@ -31,7 +31,7 @@
"Apache::module('mod_ne_exists.c')");
- ok t_cmp(Apache::exists_config_define('MODPERL2'),
+ ok t_cmp(Apache::Server::exists_config_define('MODPERL2'),
Apache->define('MODPERL2'),
'Apache->define');
1.74 +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.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- apache_functions.map 19 Jan 2004 18:47:32 -0000 1.73
+++ apache_functions.map 19 Jan 2004 19:02:41 -0000 1.74
@@ -158,7 +158,6 @@
?ap_replace_stderr_log
#MODULE=Apache::ServerConfig
- ap_exists_config_define
#XXX: thought this might be useful
#however it is not exported on win32
!ap_get_local_host
@@ -167,6 +166,7 @@
PACKAGE=Apache::Server
ap_method_register
+ ap_exists_config_define
~ap_get_server_built
~ap_get_server_version
~ap_server_root
