geoff 2004/01/19 07:15:07
Modified: lib/Apache compat.pm
t/response/TestAPI uri.pm
t/response/TestCompat apache_util.pm
xs/maps apache_functions.map
Log:
Apache::unescape_url() is now Apache::URI::unescape_url()
Revision Changes Path
1.97 +2 -2 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.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- compat.pm 14 Jan 2004 21:27:40 -0000 1.96
+++ compat.pm 19 Jan 2004 15:15:07 -0000 1.97
@@ -417,7 +417,7 @@
$r->connection->get_remote_host($type, $r->per_dir_config);
}
-#XXX: should port 1.x's Apache::unescape_url_info
+#XXX: should port 1.x's Apache::URI::unescape_url_info
sub parse_args {
my($r, $string) = @_;
return () unless defined $string and $string;
@@ -648,7 +648,7 @@
return $size;
}
-*unescape_uri = \&Apache::unescape_url;
+*unescape_uri = \&Apache::URI::unescape_url;
sub escape_uri {
my $path = shift;
1.14 +1 -1 modperl-2.0/t/response/TestAPI/uri.pm
Index: uri.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/uri.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- uri.pm 19 Dec 2003 02:40:43 -0000 1.13
+++ uri.pm 19 Jan 2004 15:15:07 -0000 1.14
@@ -95,7 +95,7 @@
my @c = qw(one two three);
$url_string = join '%20', @c;
- Apache::unescape_url($url_string);
+ Apache::URI::unescape_url($url_string);
ok $url_string eq "@c";
1.4 +1 -1 modperl-2.0/t/response/TestCompat/apache_util.pm
Index: apache_util.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestCompat/apache_util.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apache_util.pm 28 May 2003 02:04:51 -0000 1.3
+++ apache_util.pm 19 Jan 2004 15:15:07 -0000 1.4
@@ -58,7 +58,7 @@
ok t_cmp($esc_uri, $uri, "Apache::Util::escape_uri");
ok t_cmp($esc_uri, $uri2, "Apache::Util::escape_path");
- ok t_cmp(Apache::unescape_url($uri),
+ ok t_cmp(Apache::URI::unescape_url($uri),
Apache::Util::unescape_uri($uri2),
"Apache::URI::unescape_uri vs Apache::Util::unescape_uri");
1.68 +2 -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.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- apache_functions.map 14 Jan 2004 21:27:41 -0000 1.67
+++ apache_functions.map 19 Jan 2004 15:15:07 -0000 1.68
@@ -282,11 +282,12 @@
!ap_recent_rfc822_date
MODULE=Apache::URI PACKAGE=guess
- char *:ap_unescape_url | mpxs_ | SV *:url
ap_parse_uri
ap_construct_url | | r, uri=r->uri, p=r->pool
ap_construct_server | | r, hostname=ap_get_server_name(r), \
port=ap_get_server_port(r), p=r->pool
+PACKAGE=Apache::URI
+ char *:ap_unescape_url | mpxs_ | SV *:url
PACKAGE=Apache::RequestRec
mpxs_Apache__RequestRec_parsed_uri
