[prev in list] [next in list] [prev in thread] [next in thread]
List: apache-cvs
Subject: svn commit: r539277 - in /httpd/httpd/branches/2.2.x: CHANGES
From: jerenkrantz () apache ! org
Date: 2007-05-18 6:06:58
Message-ID: 20070518060659.7545A1A981A () eris ! apache ! org
[Download RAW message or body]
Author: jerenkrantz
Date: Thu May 17 23:06:57 2007
New Revision: 539277
URL: http://svn.apache.org/viewvc?view=rev&rev=539277
Log:
mod_proxy: Print the correct error message for erroneous configured ProxyPass
directives. PR 40439.
(Backport of r441947)
Reviewed by: rpluem, jim, jerenkrantz
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=539277&r1=539276&r2=539277
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu May 17 23:06:57 2007
@@ -1,6 +1,9 @@
-*- 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]
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c?view=diff&rev=539277&r1=539276&r2=539277
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c Thu May 17 23:06:57 2007
@@ -1054,11 +1054,20 @@
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';
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic