* 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

diff --git a/CHANGES b/CHANGES
index 35bde246a238c13ea532ce77663f64f52b1594b5..be3e3d83b37f194f834e687bc6a1a6ff8d192613 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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>]

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 54fff0fe39b22091b1607f5e7dc71c8e34927ebf..5795d53324765fc5ecdffe18f711c97450b02561 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1124,11 +1124,20 @@ static const char *
         else {
             char *val = strchr(word, '=');
             if (!val) {
-                if (cmd->path)
-                    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";
+                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
                 *val++ = '\0';