Commit 549ba6a3 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Correct string scope to prevent duplicated values for subsequent tokens.

Submitted by: wrowe
Backports: r1800919
Reviewed by: wrowe, jim, jchampion



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1800955 13f79535-47bb-0310-9956-ffa450edef68
parent 582a9877
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -115,11 +115,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
  [ start all new proposals below, under PATCHES PROPOSED. ]

   *) Correct string scope to prevent duplicated values for subsequent tokens.
      Submitted by: wrowe
      trunk patch: http://svn.apache.org/r1800919
      +1: wrowe, jim, jchampion

   *) Fix negotiation type parsing to be strict about "*", "*/*" and "type/*"
      comparisons.
      Submitted by: wrowe, Robert Święcki <robert swiecki.net>
+2 −2
Original line number Diff line number Diff line
@@ -965,13 +965,13 @@ static int get_digest_rec(request_rec *r, digest_header_rec *resp)

        /* find value */

        vv = 0;
        if (auth_line[0] == '=') {
            auth_line++;
            while (apr_isspace(auth_line[0])) {
                auth_line++;
            }

            vv = 0;
            if (auth_line[0] == '\"') {         /* quoted string */
                auth_line++;
                while (auth_line[0] != '\"' && auth_line[0] != '\0') {
@@ -990,8 +990,8 @@ static int get_digest_rec(request_rec *r, digest_header_rec *resp)
                    value[vv++] = *auth_line++;
                }
            }
            value[vv] = '\0';
        }
        value[vv] = '\0';

        while (auth_line[0] != ',' && auth_line[0] != '\0') {
            auth_line++;