diff options
| author | Doug MacEachern <dougm@apache.org> | 2001-08-19 18:01:05 +0200 |
|---|---|---|
| committer | Doug MacEachern <dougm@apache.org> | 2001-08-19 18:01:05 +0200 |
| commit | 2090fa874841512f229019b52a04aede28c3536a (patch) | |
| tree | 989673b4e0c1a92dcc0a7e338aa70dd979d1d03b /modules/aaa | |
| parent | Per discussion on new-httpd, change the logic to do the following: (diff) | |
| download | apache2-2090fa874841512f229019b52a04aede28c3536a.tar.xz apache2-2090fa874841512f229019b52a04aede28c3536a.zip | |
adjust to apr_uri_ rename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90361 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/aaa')
| -rw-r--r-- | modules/aaa/mod_auth_digest.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c index e7ddc7e15d..5e55b89bed 100644 --- 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); |