dougm 01/08/19 10:33:33 Modified: src/modules/perl modperl_types.h xs/APR/URI APR__URI.h xs/Apache/URI Apache__URI.h xs/maps apr_functions.map apr_structures.map apr_types.map Log: adjust to apr uri renaming Revision Changes Path 1.45 +2 -2 modperl-2.0/src/modules/perl/modperl_types.h Index: modperl_types.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_types.h,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- modperl_types.h 2001/07/15 22:33:48 1.44 +++ modperl_types.h 2001/08/19 17:33:32 1.45 @@ -219,9 +219,9 @@ void *data; } modperl_cleanup_data_t; -/* subclass apr_uri_components */ +/* subclass apr_uri_t */ typedef struct { - apr_uri_components uri; + apr_uri_t uri; apr_pool_t *pool; char *path_info; } modperl_uri_t; 1.2 +12 -12 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- APR__URI.h 2001/05/22 20:58:20 1.1 +++ APR__URI.h 2001/08/19 17:33:32 1.2 @@ -1,17 +1,17 @@ static MP_INLINE -char *mpxs_apr_uri_unparse_components(pTHX_ - apr_uri_components *uptr, - unsigned flags) +char *mpxs_apr_uri_unparse(pTHX_ + apr_uri_t *uptr, + unsigned flags) { - return apr_uri_unparse_components(((modperl_uri_t *)uptr)->pool, - uptr, flags); + return apr_uri_unparse(((modperl_uri_t *)uptr)->pool, + uptr, flags); } static MP_INLINE -apr_uri_components *mpxs_apr_uri_parse_components(pTHX_ - SV *classname, - SV *obj, - const char *uri_string) +apr_uri_t *mpxs_apr_uri_parse(pTHX_ + SV *classname, + SV *obj, + const char *uri_string) { request_rec *r = NULL; apr_pool_t *p = modperl_sv2pool(aTHX_ obj); @@ -26,17 +26,17 @@ uri_string = ap_construct_url(r->pool, r->uri, r); /*XXX*/ } #endif - (void)apr_uri_parse_components(p, uri_string, &uri->uri); + (void)apr_uri_parse(p, uri_string, &uri->uri); if (r) { uri->uri.query = r->args; } - return (apr_uri_components *)uri; + return (apr_uri_t *)uri; } static MP_INLINE -char *mpxs_APR__URI_port(apr_uri_components *uri, SV *portsv) +char *mpxs_APR__URI_port(apr_uri_t *uri, SV *portsv) { dTHX; /*XXX*/ char *port_str = uri->port_str; 1.4 +2 -2 modperl-2.0/xs/Apache/URI/Apache__URI.h Index: Apache__URI.h =================================================================== RCS file: /home/cvs/modperl-2.0/xs/Apache/URI/Apache__URI.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Apache__URI.h 2001/05/22 20:57:53 1.3 +++ Apache__URI.h 2001/08/19 17:33:32 1.4 @@ -1,12 +1,12 @@ static MP_INLINE -apr_uri_components *mpxs_Apache__RequestRec_parsed_uri(request_rec *r) +apr_uri_t *mpxs_Apache__RequestRec_parsed_uri(request_rec *r) { modperl_uri_t *uri = modperl_uri_new(r->pool); uri->uri = r->parsed_uri; uri->path_info = r->path_info; - return (apr_uri_components *)uri; + return (apr_uri_t *)uri; } static MP_INLINE int mpxs_ap_unescape_url(pTHX_ SV *url) 1.16 +5 -5 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.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- apr_functions.map 2001/08/01 02:06:06 1.15 +++ apr_functions.map 2001/08/19 17:33:32 1.16 @@ -401,11 +401,11 @@ -apr_base64_decode_binary MODULE=APR::URI -!apr_uri_parse_hostinfo_components - apr_uri_components *:apr_uri_parse_components | mpxs_ | \ - SV *:classname, SV *:p, uri=NULL | parse - apr_uri_unparse_components | mpxs_ | \ - uptr, flags=UNP_OMITPASSWORD | unparse +!apr_uri_parse_hostinfo + apr_uri_t *:apr_uri_parse | mpxs_ | \ + SV *:classname, SV *:p, uri=NULL | parse + apr_uri_unparse | mpxs_ | \ + uptr, flags=APR_URI_UNP_OMITPASSWORD | unparse #special case to set both uri->port and uri->port_str mpxs_APR__URI_port | | uri, portsv=Nullsv apr_uri_default_port_for_scheme 1.5 +2 -2 modperl-2.0/xs/maps/apr_structures.map Index: apr_structures.map =================================================================== RCS file: /home/cvs/modperl-2.0/xs/maps/apr_structures.map,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apr_structures.map 2001/05/22 20:58:05 1.4 +++ apr_structures.map 2001/08/19 17:33:32 1.5 @@ -154,7 +154,7 @@ next </apr_text> -<apr_uri_components> +<apr_uri_t> scheme hostinfo user @@ -169,4 +169,4 @@ is_initialized dns_looked_up dns_resolved -</apr_uri_components> +</apr_uri_t> 1.7 +1 -1 modperl-2.0/xs/maps/apr_types.map Index: apr_types.map =================================================================== RCS file: /home/cvs/modperl-2.0/xs/maps/apr_types.map,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apr_types.map 2001/05/22 20:58:06 1.6 +++ apr_types.map 2001/08/19 17:33:32 1.7 @@ -33,7 +33,7 @@ #apr_bucket_shared | UNDEFINED #uri -struct apr_uri_components | APR::URI +struct apr_uri_t | APR::URI #uuid struct apr_uuid_t | APR::UUID