geoff 2004/01/19 11:19:45
Modified: t/response/TestAPI rutil.pm server_util.pm
xs/maps apache_functions.map
Log:
Apache::get_status_line is now Apache::Server::get_status_line
Revision Changes Path
1.11 +1 -11 modperl-2.0/t/response/TestAPI/rutil.pm
Index: rutil.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/rutil.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rutil.pm 2 Dec 2003 15:49:22 -0000 1.10
+++ rutil.pm 19 Jan 2004 19:19:45 -0000 1.11
@@ -22,16 +22,10 @@
prospero => 191,
);
-my %status_lines = (
- 200 => '200 OK',
- 400 => '400 Bad Request',
- 500 => '500 Internal Server Error',
-);
-
sub handler {
my $r = shift;
- plan $r, tests => 18;
+ plan $r, tests => 15;
ok $r->default_type;
@@ -47,10 +41,6 @@
my $apr_port = APR::URI::port_of_scheme($scheme);
#$r->puts("$scheme => expect: $port, got: $apr_port\n");
ok $apr_port == $port;
- }
-
- while (my($code, $line) = each %status_lines) {
- ok Apache::get_status_line($code) eq $line;
}
ok $r->is_initial_req;
1.10 +13 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- server_util.pm 19 Jan 2004 19:02:41 -0000 1.9
+++ server_util.pm 19 Jan 2004 19:19:45 -0000 1.10
@@ -45,8 +45,14 @@
'__PACKAGE__->new($r)' => __PACKAGE__->new($r),
);
+ my %status_lines = (
+ 200 => '200 OK',
+ 400 => '400 Bad Request',
+ 500 => '500 Internal Server Error',
+ );
plan $r, tests => (scalar keys %pools) +
- (scalar keys %objects) + 11;
+ (scalar keys %objects) +
+ (scalar keys %status_lines) + 11;
# syntax - an object or pool is required
t_debug("Apache::server_root_relative() died");
@@ -117,6 +123,12 @@
t_debug('Apache::Server::exists_config_define');
ok Apache::Server::exists_config_define('MODPERL2');
ok ! Apache::Server::exists_config_define('FOO');
+
+ while (my($code, $line) = each %status_lines) {
+ ok t_cmp($line,
+ Apache::Server::get_status_line($code),
+ "Apache::Server::get_status_line($code)");
+ }
Apache::OK;
}
1.76 +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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- apache_functions.map 19 Jan 2004 19:07:26 -0000 1.75
+++ apache_functions.map 19 Jan 2004 19:19:45 -0000 1.76
@@ -40,7 +40,6 @@
ap_get_server_name
ap_get_server_port
!ap_content_type_tolower
- ap_get_status_line
ap_is_initial_req
>ap_method_registry_init
>ap_process_request_internal
@@ -167,6 +166,7 @@
ap_method_register
ap_exists_config_define
ap_add_version_component
+ ap_get_status_line
~ap_get_server_built
~ap_get_server_version
~ap_server_root
