Commit ca326803 authored by Joe Orton's avatar Joe Orton
Browse files

* modules/aaa/mod_auth_digest.c: Another gcc 4 "structure field may be 

used uninitialized" warning; fix validation of digest-uri for CONNECT
requests:

(copy_uri_components): Copy the hostinfo field.
(authenticate_digest_user): Don't pass NULL (or, previously, a random
pointer) to strcmp if a digest-uri is provided which doesn't match the
request-uri in a CONNECT request.


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

modules/aaa/mod_auth_digest.c

+3 −1
Changes for modules/aaa/mod_auth_digest.c: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1575,6 +1575,8 @@ static void copy_uri_components(apr_uri_t *dst, 
    else {

        dst->query = src->query;

    }



    dst->hostinfo = src->hostinfo;

}



/* These functions return 0 if client is OK, and proper error status
@@ -1709,7 +1711,7 @@ static int authenticate_digest_user(request_rec *r) 
        }



        if (r->method_number == M_CONNECT) {

            if (strcmp(resp->uri, r_uri.hostinfo)) {

            if (!r_uri.hostinfo || strcmp(resp->uri, r_uri.hostinfo)) {

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                              "Digest: uri mismatch - <%s> does not match "

                              "request-uri <%s>", resp->uri, r_uri.hostinfo);