You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2006/04/16 23:02:25 UTC
svn commit: r394557 - in /httpd/httpd/branches/2.2.x: STATUS
modules/proxy/proxy_util.c
Author: niq
Date: Sun Apr 16 14:02:24 2006
New Revision: 394557
URL: http://svn.apache.org/viewcvs?rev=394557&view=rev
Log:
Fix PR#39321 (Segfault if bad URL is specified in ProxyPass)
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=394557&r1=394556&r2=394557&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Apr 16 14:02:24 2006
@@ -74,10 +74,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * Backport fix to PR#39321 (Segfault if bad URL is specified in ProxyPass)
- http://svn.apache.org/viewcvs?rev=394390&view=rev
- +1: niq, rpluem, trawick
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
* mod_dbd: When threaded, create a private pool in child_init
Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?rev=394557&r1=394556&r2=394557&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Sun Apr 16 14:02:24 2006
@@ -1308,6 +1308,9 @@
if (rv != APR_SUCCESS) {
return "Unable to parse URL";
}
+ if (!uri.hostname || !uri.scheme) {
+ return "URL must be absolute!";
+ }
ap_str_tolower(uri.hostname);
ap_str_tolower(uri.scheme);