adjust to apr_uri_ rename

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90361 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/httpd.h b/include/httpd.h
index 61dffbcf188baed9df090358bc5a2c66dd9eda67..9397930736f03fe88b3781d4152cc66303ec2d88 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -793,7 +793,7 @@ struct request_rec {
     /** ST_MODE set to zero if no such file */
     apr_finfo_t finfo;
     /** components of uri, dismantled */
-    apr_uri_components parsed_uri;
+    apr_uri_t parsed_uri;
 
     /* Various other config info which may change with .htaccess files
      * These are config vectors, with one void* pointer for each module

diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index e7ddc7e15d9d4c27791f52c65c0460698cb0fd93..5e55b89bedfa7a13ba5b1c50fd086132eba2cbc5 100644 (file)
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -236,7 +236,7 @@ typedef struct digest_header_struct {
     apr_time_t             nonce_time;
     enum hdr_sts          auth_hdr_sts;
     const char           *raw_request_uri;
-    apr_uri_components    *psd_request_uri;
+    apr_uri_t    *psd_request_uri;
     int                   needed_auth;
     client_entry         *client;
 } digest_header_rec;
@@ -1514,8 +1514,8 @@ static const char *new_digest(const request_rec *r,
 }
 
 
-static void copy_uri_components(apr_uri_components *dst, 
-                                apr_uri_components *src, request_rec *r) {
+static void copy_uri_components(apr_uri_t *dst, 
+                                apr_uri_t *src, request_rec *r) {
     if (src->scheme && src->scheme[0] != '\0')
        dst->scheme = src->scheme;
     else
@@ -1624,10 +1624,10 @@ static int authenticate_digest_user(request_rec *r)
        /* Hmm, the simple match didn't work (probably a proxy modified the
         * request-uri), so lets do a more sophisticated match
         */
-       apr_uri_components r_uri, d_uri;
+       apr_uri_t r_uri, d_uri;
 
        copy_uri_components(&r_uri, resp->psd_request_uri, r);
-       if (apr_uri_parse_components(r->pool, resp->uri, &d_uri) != APR_SUCCESS) {
+       if (apr_uri_parse(r->pool, resp->uri, &d_uri) != APR_SUCCESS) {
            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
                          "Digest: invalid uri <%s> in Authorization header",
                          resp->uri);

diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c
index e5419a41e8528e4171af412149d02f3105b688f3..01d345f253a522d6a625c0d789779ec73e0252a8 100644 (file)
--- a/modules/dav/main/util.c
+++ b/modules/dav/main/util.c
@@ -189,12 +189,12 @@ dav_lookup_result dav_lookup_uri(const char *uri, request_rec * r,
     dav_lookup_result result = { 0 };
     const char *scheme;
     apr_port_t port;
-    apr_uri_components comp;
+    apr_uri_t comp;
     char *new_file;
     const char *domain;
 
     /* first thing to do is parse the URI into various components */
-    if (apr_uri_parse_components(r->pool, uri, &comp) != APR_SUCCESS) {
+    if (apr_uri_parse(r->pool, uri, &comp) != APR_SUCCESS) {
        result.err.status = HTTP_BAD_REQUEST;
        result.err.desc = "Invalid syntax in Destination URI.";
        return result;
@@ -288,7 +288,7 @@ dav_lookup_result dav_lookup_uri(const char *uri, request_rec * r,
        the current request. Therefore, we can use ap_sub_req_lookup_uri() */
 
     /* reconstruct a URI as just the path */
-    new_file = apr_uri_unparse_components(r->pool, &comp, APR_URI_UNP_OMITSITEPART);
+    new_file = apr_uri_unparse(r->pool, &comp, APR_URI_UNP_OMITSITEPART);
 
     /*
      * Lookup the URI and return the sub-request. Note that we use the
@@ -542,7 +542,7 @@ static dav_error * dav_process_if_header(request_rec *r, dav_if_header **p_ih)
     const char *uri = NULL;    /* scope of current production; NULL=no-tag */
     size_t uri_len = 0;
     dav_if_header *ih = NULL;
-    apr_uri_components parsed_uri;
+    apr_uri_t parsed_uri;
     const dav_hooks_locks *locks_hooks = DAV_GET_HOOKS_LOCKS(r);
     enum {no_tagged, tagged, unknown} list_type = unknown;
     int condition;
@@ -566,7 +566,7 @@ static dav_error * dav_process_if_header(request_rec *r, dav_if_header **p_ih)
             
             /* 2518 specifies this must be an absolute URI; just take the
              * relative part for later comparison against r->uri */
-            if (apr_uri_parse_components(r->pool, uri, &parsed_uri) != APR_SUCCESS) {
+            if (apr_uri_parse(r->pool, uri, &parsed_uri) != APR_SUCCESS) {
                 return dav_new_error(r->pool, HTTP_BAD_REQUEST,
                                      DAV_ERR_IF_TAGGED,
                                      "Invalid URI in tagged If-header.");

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 3e5ae5c1447dd20c3443a39f06e6fc26d9d2e71c..b32ab105d76f44fa72b5e08ef2068c70ead4f144 100644 (file)
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -344,7 +344,7 @@ static const char *log_request_line(request_rec *r, char *a)
             * (note also that r->the_request contains the unmodified request)
             */
     return (r->parsed_uri.password) ? apr_pstrcat(r->pool, r->method, " ",
-                                        apr_uri_unparse_components(r->pool, &r->parsed_uri, 0),
+                                        apr_uri_unparse(r->pool, &r->parsed_uri, 0),
                                         r->assbackwards ? NULL : " ", r->protocol, NULL)
                                        : r->the_request;
 }

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index f37228571f35c07738e22f8b3422596162c7289c..31aa90e456f5f648f700bf0f6124593bb38a996e 100644 (file)
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -335,8 +335,8 @@ static char *try_alias_list(request_rec *r, apr_array_header_t *aliases, int doe
                    found = ap_pregsub(r->pool, p->real, r->uri,
                                    p->regexp->re_nsub + 1, regm);
                    if (found && doesc) {
-                        apr_uri_components uri;
-                        apr_uri_parse_components(r->pool, found, &uri);
+                        apr_uri_t uri;
+                        apr_uri_parse(r->pool, found, &uri);
                        found = ap_escape_uri(r->pool, uri.path);
                         if (uri.query) {
                             found = apr_pstrcat(r->pool, found, "?", uri.query, NULL);

diff --git a/modules/test/mod_test_util_uri.c b/modules/test/mod_test_util_uri.c
index 1ba90c8fce30e11e0e05a654ae0905e18189f19c..45ca811ae9a968667c08367ea4c587486ab5d70b 100644 (file)
--- a/modules/test/mod_test_util_uri.c
+++ b/modules/test/mod_test_util_uri.c
@@ -142,7 +142,7 @@ static unsigned iterate_pieces(request_rec *r, const test_uri_t *pieces, int row
     apr_pool_t *sub;
     char *input_uri;
     char *strp;
-    apr_uri_components result;
+    apr_uri_t result;
     unsigned expect;
     int status;
     unsigned failures;
@@ -208,7 +208,7 @@ static unsigned iterate_pieces(request_rec *r, const test_uri_t *pieces, int row
        *strp = 0;
 
        apr_pool_sub_make(&sub, r->pool, NULL);
-       status = apr_uri_parse_components(sub, input_uri, &result);
+       status = apr_uri_parse(sub, input_uri, &result);
        if (status == APR_SUCCESS) {
 #define CHECK(f)                                                       \
            if ((expect & T_##f)                                        \

diff --git a/server/protocol.c b/server/protocol.c
index 6fbea7ebea6bc958d06d61d434745896e6b2ff55..a832ada172858bfc2fa9d77a586b5cf37e6c5a15 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -325,11 +325,11 @@ AP_CORE_DECLARE(void) ap_parse_uri(request_rec *r, const char *uri)
     r->unparsed_uri = apr_pstrdup(r->pool, uri);
 
     if (r->method_number == M_CONNECT) {
-       status = apr_uri_parse_hostinfo_components(r->pool, uri, &r->parsed_uri);
+       status = apr_uri_parse_hostinfo(r->pool, uri, &r->parsed_uri);
     }
     else {
        /* Simple syntax Errors in URLs are trapped by parse_uri_components(). */
-       status = apr_uri_parse_components(r->pool, uri, &r->parsed_uri);
+       status = apr_uri_parse(r->pool, uri, &r->parsed_uri);
     }
 
     if (status == APR_SUCCESS) {

diff --git a/server/scoreboard.c b/server/scoreboard.c
index c821dbaa3abc8a968b08f9476ad84c0472526744..5b424fd93a082cdc7e8aeb618cee3225185a3b78 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -321,7 +321,7 @@ AP_DECLARE(int) ap_update_child_status(int child_num, int thread_num, int status
            } else {
                /* Don't reveal the password in the server-status view */
                    apr_cpystrn(ws->request, apr_pstrcat(r->pool, r->method, " ",
-                                              apr_uri_unparse_components(r->pool, &r->parsed_uri, APR_URI_UNP_OMITPASSWORD),
+                                              apr_uri_unparse(r->pool, &r->parsed_uri, APR_URI_UNP_OMITPASSWORD),
                                               r->assbackwards ? NULL : " ", r->protocol, NULL),
                                       sizeof(ws->request));
            }