dougm 02/05/10 09:49:10
Modified: lib/Apache compat.pm
t/response/TestAPI uri.pm
xs/maps apache_functions.map
Log:
move construct_url method to Apache::URI module
default construct_url args uri=r->uri and pool=r->pool
Revision Changes Path
1.40 +1 -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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- compat.pm 10 May 2002 16:38:39 -0000 1.39
+++ compat.pm 10 May 2002 16:49:10 -0000 1.40
@@ -24,7 +24,6 @@
use Apache::Access ();
use Apache::RequestIO ();
use Apache::RequestUtil ();
-use Apache::ServerUtil ();
use Apache::Response ();
use Apache::Log ();
use APR::Table ();
@@ -386,7 +385,7 @@
sub Apache::URI::parse {
my($class, $r, $uri) = @_;
- $uri ||= $r->construct_url($r->uri, $r->pool);
+ $uri ||= $r->construct_url;
APR::URI->parse($r, $uri);
}
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- uri.pm 11 Apr 2002 11:08:43 -0000 1.5
+++ uri.pm 10 May 2002 16:49:10 -0000 1.6
@@ -30,7 +30,7 @@
my $up = $uri->unparse;
ok $up =~ m:^$location:;
- my $curl = $r->construct_url($r->uri, $r->pool);
+ my $curl = $r->construct_url;
my $parsed = APR::URI->parse($r, $curl);
ok $parsed->isa('APR::URI');
1.47 +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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- apache_functions.map 29 Mar 2002 00:52:44 -0000 1.46
+++ apache_functions.map 10 May 2002 16:49:10 -0000 1.47
@@ -140,7 +140,6 @@
MODULE=Apache::ServerUtil PACKAGE=guess BOOT=1
ap_add_version_component
ap_construct_server
- ap_construct_url | | r,uri,p
ap_error_log2stderr
#MODULE=Apache::ServerConfig
@@ -264,6 +263,7 @@
MODULE=Apache::URI PACKAGE=guess
ap_unescape_url | mpxs_ | SV *:url
ap_parse_uri
+ ap_construct_url | | r,uri=r->uri,p=r->pool
PACKAGE=Apache::RequestRec
mpxs_Apache__RequestRec_parsed_uri
