Commit 996e23b0 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, jchampion, ylavic



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1800962 13f79535-47bb-0310-9956-ffa450edef68
parent 1e133f74

STATUS

+0 −5
Original line number Original line Diff line number Diff line
@@ -110,11 +110,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
      trunk patch: http://svn.apache.org/r1800917

      trunk patch: http://svn.apache.org/r1800917

      +1: wrowe, jchampion (inspection), ylavic

      +1: wrowe, jchampion (inspection), ylavic





   *) Correct string scope to prevent duplicated values for subsequent tokens.

      Submitted by: wrowe

      trunk patch: http://svn.apache.org/r1800919

      +1: wrowe, jchampion, ylavic







PATCHES PROPOSED TO BACKPORT FROM TRUNK:

PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

  [ New proposals should be added at the end of the list ]

modules/aaa/mod_auth_digest.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -894,13 +894,13 @@ static int get_digest_rec(request_rec *r, digest_header_rec *resp) 




        /* find value */

        /* find value */





        vv = 0;

        if (auth_line[0] == '=') {

        if (auth_line[0] == '=') {

            auth_line++;

            auth_line++;

            while (apr_isspace(auth_line[0])) {

            while (apr_isspace(auth_line[0])) {

                auth_line++;

                auth_line++;

            }

            }





            vv = 0;

            if (auth_line[0] == '\"') {         /* quoted string */

            if (auth_line[0] == '\"') {         /* quoted string */

                auth_line++;

                auth_line++;

                while (auth_line[0] != '\"' && auth_line[0] != '\0') {

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

                    value[vv++] = *auth_line++;

                }

                }

            }

            }

            value[vv] = '\0';

        }

        }

        value[vv] = '\0';





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

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

            auth_line++;

            auth_line++;