From ef038e0617cc9ba17a11afa1e60d7ac1f98217a1 Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Sun, 10 Sep 2006 12:37:21 +0000 Subject: [PATCH] * 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 --- CHANGES | 3 +++ modules/proxy/mod_proxy.c | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 35bde246a2..be3e3d83b3 100644 --- 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 ] diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 54fff0fe39..5795d53324 100644 --- 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'; -- 2.40.0