stas 2004/08/11 23:40:46
Modified: t/response/TestAPI conn_rec.pm
t/api .cvsignore
xs/maps apache_structures.map
. Changes
Added: t/response/TestAPI conn_util.pm
Log:
1) Apache::Connection changes [Stas, "Fred Moyer" <fred
/about/taperfriendlymusic.org>]
readwrite => readonly:
pool, base_server, local_addr, remote_addr, remote_ip, remote_host,
aborted, local_ip, local_host, id, conn_config, sbh, bucket_alloc
removed: logname
2) split conn_rec test in two parts (sync tests with the API changes)
Revision Changes Path
1.12 +8 -29 modperl-2.0/t/response/TestAPI/conn_rec.pm
Index: conn_rec.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/conn_rec.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- conn_rec.pm 9 Jul 2004 08:01:21 -0000 1.11
+++ conn_rec.pm 12 Aug 2004 06:40:45 -0000 1.12
@@ -1,5 +1,8 @@
package TestAPI::conn_rec;
+# this test module is only for testing fields in the conn_rec listed
+# in apache_structures.map (but some fields are tested in other tests)
+
use strict;
use warnings FATAL => 'all';
@@ -13,15 +16,12 @@
use Apache::Const -compile => qw(OK REMOTE_HOST REMOTE_NAME
REMOTE_NOLOOKUP REMOTE_DOUBLE_REV CONN_CLOSE);
-#this test module is only for testing fields in the conn_rec
-#listed in apache_structures.map
-
sub handler {
my $r = shift;
my $c = $r->connection;
- plan $r, tests => 23;
+ plan $r, tests => 14;
ok $c;
@@ -39,9 +39,7 @@
ok $c->remote_host || 1;
- ok $c->remote_logname || 1;
-
- ok $c->aborted || 1;
+ ok !$c->aborted;
ok t_cmp($c->keepalive,
Apache::CONN_CLOSE,
@@ -51,31 +49,12 @@
ok $c->local_host || 1;
- ok $c->id || 1;
-
- #conn_config
+ ok $c->id;
ok $c->notes;
- ok $r->notes;
-
- #input_filters
- #output_filters
- #remain
-
- # Connection utils (XXX: move to conn_utils.pm?)
-
- # $c->get_remote_host
- ok $c->get_remote_host() || 1;
-
- for (Apache::REMOTE_HOST, Apache::REMOTE_NAME,
- Apache::REMOTE_NOLOOKUP, Apache::REMOTE_DOUBLE_REV) {
- ok $c->get_remote_host($_) || 1;
- }
-
- ok $c->get_remote_host(Apache::REMOTE_HOST,
- $r->per_dir_config) || 1;
- ok $c->get_remote_host(Apache::REMOTE_HOST, $r->per_dir_config) || 1;
+ # XXX: missing tests
+ # conn_config
Apache::OK;
}
1.1 modperl-2.0/t/response/TestAPI/conn_util.pm
Index: conn_util.pm
===================================================================
package TestAPI::conn_util;
use strict;
use warnings FATAL => 'all';
use Apache::TestUtil;
use Apache::Test;
use Apache::RequestRec ();
use Apache::RequestUtil ();
use Apache::Connection ();
use Apache::Const -compile => qw(OK REMOTE_HOST REMOTE_NAME
REMOTE_NOLOOKUP REMOTE_DOUBLE_REV CONN_CLOSE);
sub handler {
my $r = shift;
my $c = $r->connection;
plan $r, tests => 7;
ok $c->get_remote_host() || 1;
for (Apache::REMOTE_HOST, Apache::REMOTE_NAME,
Apache::REMOTE_NOLOOKUP, Apache::REMOTE_DOUBLE_REV) {
ok $c->get_remote_host($_) || 1;
}
ok $c->get_remote_host(Apache::REMOTE_HOST,
$r->per_dir_config) || 1;
ok $c->get_remote_host(Apache::REMOTE_HOST, $r->per_dir_config) || 1;
# XXX: missing tests
# remain
Apache::OK;
}
1;
1.14 +1 -0 modperl-2.0/t/api/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/modperl-2.0/t/api/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- .cvsignore 11 Aug 2004 00:15:19 -0000 1.13
+++ .cvsignore 12 Aug 2004 06:40:45 -0000 1.14
@@ -2,6 +2,7 @@
aplog.t
command.t
conn_rec.t
+conn_util.t
lookup_uri2.t
lookup_uri.t
module.t
1.42 +14 -14 modperl-2.0/xs/maps/apache_structures.map
Index: apache_structures.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_structures.map,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -u -r1.41 -r1.42
--- apache_structures.map 11 Aug 2004 18:03:01 -0000 1.41
+++ apache_structures.map 12 Aug 2004 06:40:45 -0000 1.42
@@ -100,27 +100,27 @@
</server_rec>
<conn_rec>
- pool
- base_server
+< pool
+< base_server
> vhost_lookup_data
- local_addr
- remote_addr
- remote_ip
- remote_host
- remote_logname
- aborted
+< local_addr
+< remote_addr
+< remote_ip
+< remote_host
+- remote_logname
+< aborted
keepalive
? double_reverse
keepalives
- local_ip
- local_host
- id
- conn_config
+< local_ip
+< local_host
+< id
+< conn_config
notes
input_filters
output_filters
- sbh
- bucket_alloc
+< sbh
+< bucket_alloc
</conn_rec>
!<server_addr_rec>
1.442 +10 -1 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -u -r1.441 -r1.442
--- Changes 11 Aug 2004 23:03:18 -0000 1.441
+++ Changes 12 Aug 2004 06:40:45 -0000 1.442
@@ -1,4 +1,4 @@
- =head1 NAME
+=head1 NAME
Changes - Apache mod_perl changes logfile
@@ -11,6 +11,15 @@
=over 3
=item 1.99_15-dev
+
+Apache::Connection changes [Stas, "Fred Moyer" <fred /about/
+taperfriendlymusic.org>]
+- readwrite => readonly:
+
+ pool, base_server, local_addr, remote_addr, remote_ip, remote_host,
+ aborted, local_ip, local_host, id, conn_config, sbh, bucket_alloc
+
+- removed: logname
Move check_cmd_context from Apache::Command to Apache::CmdParms.
[Gozer]
