Commit 27f1c20c authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1735786 from trunk: 

fix order of lowercase/compare for r->handler

Submitted by: covener
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735802 13f79535-47bb-0310-9956-ffa450edef68
parent ce57ef12

STATUS

+0 −4
Original line number Diff line number Diff line
@@ -112,10 +112,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) core: fix r->handler = None case sensitivity

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

     2.4.x patch: trunk works

     +1: covener, ylavic, jim

   



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

server/core.c

+9 −9
Original line number Diff line number Diff line
@@ -4453,18 +4453,18 @@ static int core_override_type(request_rec *r) 
                          "Can't evaluate handler expression: %s", err);

            return HTTP_INTERNAL_SERVER_ERROR;

        }

        if (strcmp(val, "none")) { 



        if (val != ap_strstr_c(val, "proxy:unix")) { 

            /* Retained for compatibility --  but not for UDS */

            char *tmp = apr_pstrdup(r->pool, val);

            ap_str_tolower(tmp);

                r->handler = tmp;

            val = tmp;

        }

            else { 



        if (strcmp(val, "none")) { 

            r->handler = val;

        }

    }

    }

    else if (conf->handler && strcmp(conf->handler, "none")) { 

        r->handler = conf->handler;

    }