stas 2004/07/04 01:34:18
Modified: . Changes
t/response/TestAPI rutil.pm server_util.pm
xs/maps apache_functions.map
Log:
Moving methods:
Apache::get_status_line => Apache::RequestUtil::get_status_line
Revision Changes Path
1.400 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.399
retrieving revision 1.400
diff -u -u -r1.399 -r1.400
--- Changes 3 Jul 2004 05:36:17 -0000 1.399
+++ Changes 4 Jul 2004 08:34:17 -0000 1.400
@@ -12,6 +12,9 @@
=item 1.99_15-dev
+Moving methods [Stas]
+ Apache::get_status_line => Apache::RequestUtil::get_status_line
+
Adjust the list of mod_perl header files installed into the Apache2
include/ directory, made necessary from the renaming and refactoring
arising from the decoupling of APR and APR::* from mod_perl.so.
1.14 +13 -1 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.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- rutil.pm 3 Jul 2004 18:45:46 -0000 1.13
+++ rutil.pm 4 Jul 2004 08:34:18 -0000 1.14
@@ -10,10 +10,16 @@
use Apache::Const -compile => 'OK';
+my %status_lines = (
+ 200 => '200 OK',
+ 400 => '400 Bad Request',
+ 500 => '500 Internal Server Error',
+);
+
sub handler {
my $r = shift;
- plan $r, tests => 7;
+ plan $r, tests => (scalar keys %status_lines) + 7;
ok $r->default_type;
@@ -33,6 +39,12 @@
$pattern,
"test for the request_line, host, status, and few " .
" headers that should always be there");
+
+ while (my($code, $line) = each %status_lines) {
+ ok t_cmp($line,
+ Apache::RequestUtil::get_status_line($code),
+ "Apache::RequestUtil::get_status_line($code)");
+ }
Apache::OK;
}
1.18 +3 -15 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.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- server_util.pm 3 Jul 2004 21:18:27 -0000 1.17
+++ server_util.pm 4 Jul 2004 08:34:18 -0000 1.18
@@ -45,15 +45,9 @@
'__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) +
- (scalar keys %status_lines) + 12;
+ plan $r, tests => 12 +
+ (scalar keys %pools) +
+ (scalar keys %objects);
{
my $s = $r->server;
@@ -133,12 +127,6 @@
t_debug('Apache::exists_config_define');
ok Apache::exists_config_define('MODPERL2');
ok ! Apache::exists_config_define('FOO');
-
- while (my($code, $line) = each %status_lines) {
- ok t_cmp($line,
- Apache::get_status_line($code),
- "Apache::get_status_line($code)");
- }
Apache::OK;
}
1.84 +3 -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.83
retrieving revision 1.84
diff -u -u -r1.83 -r1.84
--- apache_functions.map 4 Jun 2004 03:20:46 -0000 1.83
+++ apache_functions.map 4 Jul 2004 08:34:18 -0000 1.84
@@ -35,13 +35,15 @@
# for details see: %ModPerl::MapUtil::disabled_map
# in lib/ModPerl/MapUtil.pm
+MODULE=Apache::RequestUtil
+ ap_get_status_line
+
MODULE=Apache::RequestUtil PACKAGE=guess
>ap_finalize_request_protocol
ap_default_type
ap_get_server_name
ap_get_server_port
!ap_content_type_tolower
- ap_get_status_line
ap_is_initial_req
ap_method_register
>ap_method_registry_init
