dougm 02/05/13 18:32:50
Modified: lib/Apache compat.pm
t/response/TestAPI uri.pm
xs/APR/URI APR__URI.h
xs/maps apr_functions.map
Log:
remove broken attempt to support APR::URI->parse($r)
Revision Changes Path
1.43 +1 -1 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- compat.pm 14 May 2002 01:14:19 -0000 1.42
+++ compat.pm 14 May 2002 01:32:50 -0000 1.43
@@ -392,7 +392,7 @@
$uri ||= $r->construct_url;
- APR::URI->parse($r, $uri);
+ APR::URI->parse($r->pool, $uri);
}
1;
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- uri.pm 10 May 2002 17:01:48 -0000 1.7
+++ uri.pm 14 May 2002 01:32:50 -0000 1.8
@@ -34,7 +34,7 @@
ok $server eq join ':', $r->get_server_name, $r->get_server_port;
my $curl = $r->construct_url;
- my $parsed = APR::URI->parse($r, $curl);
+ my $parsed = APR::URI->parse($r->pool, $curl);
ok $parsed->isa('APR::URI');
1.4 +1 -16 modperl-2.0/xs/APR/URI/APR__URI.h
Index: APR__URI.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/URI/APR__URI.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- APR__URI.h 7 Nov 2001 03:39:08 -0000 1.3
+++ APR__URI.h 14 May 2002 01:32:50 -0000 1.4
@@ -10,27 +10,12 @@
static MP_INLINE
apr_uri_t *mpxs_apr_uri_parse(pTHX_
SV *classname,
- SV *obj,
+ apr_pool_t *p,
const char *uri_string)
{
- request_rec *r = NULL;
- apr_pool_t *p = modperl_sv2pool(aTHX_ obj);
modperl_uri_t *uri = modperl_uri_new(p);
- if (!p) {
- return NULL;
- }
-#if 0
- if (!uri_string) {
- r = mp_xs_sv2_r(obj);
- uri_string = ap_construct_url(r->pool, r->uri, r); /*XXX*/
- }
-#endif
(void)apr_uri_parse(p, uri_string, &uri->uri);
-
- if (r) {
- uri->uri.query = r->args;
- }
return (apr_uri_t *)uri;
}
1.38 +1 -1 modperl-2.0/xs/maps/apr_functions.map
Index: apr_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apr_functions.map,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- apr_functions.map 13 May 2002 00:34:45 -0000 1.37
+++ apr_functions.map 14 May 2002 01:32:50 -0000 1.38
@@ -522,7 +522,7 @@
MODULE=APR::URI
!apr_uri_parse_hostinfo
apr_uri_t *:apr_uri_parse | mpxs_ | \
- SV *:classname, SV *:p, uri=NULL | parse
+ SV *:classname, p, uri | parse
apr_uri_unparse | mpxs_ | \
uptr, flags=APR_URI_UNP_OMITPASSWORD | unparse
#special case to set both uri->port and uri->port_str
