stas 2004/10/27 15:48:29
Modified: . Changes
xs/maps apache_structures.map
t/response/TestAPI conn_rec.pm
Log:
Apache::Connection::remote_ip is now settable (needed to set the
remote_ip record based on proxy's X-Forwarded-For header)
Revision Changes Path
1.520 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -u -r1.519 -r1.520
--- Changes 27 Oct 2004 22:03:11 -0000 1.519
+++ Changes 27 Oct 2004 22:48:29 -0000 1.520
@@ -12,6 +12,9 @@
=item 1.99_18-dev
+Apache::Connection::remote_ip is now settable (needed to set the
+remote_ip record based on proxy's X-Forwarded-For header) [Stas]
+
Fix Modperl::Util::unload_package() [Gozer]
- Mistakenly skipping small entries of size 2 and less
- Leave entries from other packages alone
1.49 +3 -3 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.48
retrieving revision 1.49
diff -u -u -r1.48 -r1.49
--- apache_structures.map 17 Sep 2004 00:07:24 -0000 1.48
+++ apache_structures.map 27 Oct 2004 22:48:29 -0000 1.49
@@ -104,16 +104,16 @@
< base_server
> vhost_lookup_data
< local_addr
+< local_ip
+< local_host
< remote_addr
-< remote_ip
+ remote_ip
< remote_host
- remote_logname
< aborted
keepalive
? double_reverse
keepalives
-< local_ip
-< local_host
< id
< conn_config
notes
1.16 +14 -2 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.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- conn_rec.pm 13 Aug 2004 02:06:02 -0000 1.15
+++ conn_rec.pm 27 Oct 2004 22:48:29 -0000 1.16
@@ -20,7 +20,7 @@
my $c = $r->connection;
- plan $r, tests => 14;
+ plan $r, tests => 16;
ok $c;
@@ -34,7 +34,19 @@
ok $c->remote_addr->isa('APR::SockAddr');
- ok $c->remote_ip;
+ # remote_ip
+ {
+ my $remote_ip_org = $c->remote_ip;
+ my $remote_ip_new = "10.10.10.255";
+ ok $remote_ip_org;
+
+ $c->remote_ip($remote_ip_new);
+ ok t_cmp $c->remote_ip, $remote_ip_new;
+
+ # restore
+ $c->remote_ip($remote_ip_org);
+ ok t_cmp $c->remote_ip, $remote_ip_org;
+ }
ok $c->remote_host || 1;