Commit 8c630830 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Print the correct error message for erroneous configured ProxyPass directives. 

PR: 40439
Submitted by: serai lans-tv.com
Reviewed by: rpluem


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]













  *) mod_proxy: Print the correct error message for erroneous configured













     ProxyPass directives. PR 40439. [serai lans-tv.com]



























  *) Allow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util















     statically like the older support programs.















     [Eric Covener <covener gmail.com>]

































modules/proxy/mod_proxy.c



+14
−5






























Original line number
Diff line number
Diff line








@@ -1124,11 +1124,20 @@ static const char *













        else {















            char *val = strchr(word, '=');















            if (!val) {













                if (cmd->path)













                if (cmd->path) {













                    if (*r == '/') {













                        return "ProxyPass can not have a path when defined in "













                               "a location.";













                    }













                    else {













                        return "Invalid ProxyPass parameter. Parameter must "













                               "be in the form 'key=value'.";













                    }













                }













                else {















                    return "Invalid ProxyPass parameter. Parameter must be "













                           "in the form 'key=value'";













                else













                    return "ProxyPass can not have a path when defined in a location";













                           "in the form 'key=value'.";













                }















            }















            else















                *val++ = '\0';