adjust to UNP_ -> APR_URI_UNP_ rename

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

diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c
index 059655d8f96ee77bf252f2b9fb437d9f5629af35..e5419a41e8528e4171af412149d02f3105b688f3 100644 (file)
--- a/modules/dav/main/util.c
+++ b/modules/dav/main/util.c
@@ -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, UNP_OMITSITEPART);
+    new_file = apr_uri_unparse_components(r->pool, &comp, APR_URI_UNP_OMITSITEPART);
 
     /*
      * Lookup the URI and return the sub-request. Note that we use the

diff --git a/server/scoreboard.c b/server/scoreboard.c
index 22d9d910819e6ccc5b41cfca631395ed49051c82..c821dbaa3abc8a968b08f9476ad84c0472526744 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, UNP_OMITPASSWORD),
+                                              apr_uri_unparse_components(r->pool, &r->parsed_uri, APR_URI_UNP_OMITPASSWORD),
                                               r->assbackwards ? NULL : " ", r->protocol, NULL),
                                       sizeof(ws->request));
            }