Commit 024fa8a3 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

mod_proxy: Print the correct error message for erroneous configured ProxyPass 

directives. PR 40439.

(Backport of r441947)

Reviewed by: rpluem, jim, jerenkrantz


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

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.5













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













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



























  *) mod_so: Provide more helpful LoadModule feedback when an error occurs.















     [William Rowe]















































modules/proxy/mod_proxy.c



+14
−5






























Original line number
Diff line number
Diff line








@@ -1054,11 +1054,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';