--- apr_uri.h 2004-02-13 09:52:42.000000000 +0100 +++ apr_uri.h.cumulative 2004-04-18 08:36:04.000000000 +0100 @@ -162,6 +162,32 @@ apr_uri_t *uptr); /** + * Parse a given URI, fill in all supplied fields of a apr_uri_t structure. + * If the given URI is relative, then resolve it using a supplied base + * @param p The pool to allocate out of + * @param base The base to resolve against + * @param uri The uri to parse + * @param uptr The apr_uri_t to fill out + * @return An HTTP status code +*/ +APU_DECLARE(int) apr_uri_parse_relative(apr_pool_t *p, + const apr_uri_t *base, + const char* uri, + apr_uri_t* uptr); + +/** + * Resolve an already-initialised but possibly-relative URL + * against a given base URL. + * @param p The pool to allocate out of + * @param base The base to resolve against + * @param uptr The apr_uri_t to resolve + * @return An HTTP status code + */ +APU_DECLARE(int) apr_uri_resolve_relative(apr_pool_t *p, + const apr_uri_t *base, + apr_uri_t *uptr); + +/** * Special case for CONNECT parsing: it comes with the hostinfo part only * @param p The pool to allocate out of * @param hostinfo The hostinfo string to parse