Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 87135 invoked by uid 500); 8 Aug 2002 17:59:19 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 87113 invoked by uid 500); 8 Aug 2002 17:59:19 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 8 Aug 2002 17:59:18 -0000 Message-ID: <20020808175918.11286.qmail@icarus.apache.org> From: minfrin@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/proxy proxy_http.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N minfrin 2002/08/08 10:59:18 Modified: . CHANGES modules/proxy proxy_http.c Log: Fix proxy so that it is possible to access ftp: URLs via a proxy chain. Submitted by: Peter Van Biesen Reviewed by: Graham Leggett Revision Changes Path 1.882 +3 -0 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.881 retrieving revision 1.882 diff -u -r1.881 -r1.882 --- CHANGES 7 Aug 2002 15:26:15 -0000 1.881 +++ CHANGES 8 Aug 2002 17:59:18 -0000 1.882 @@ -1,5 +1,8 @@ Changes with Apache 2.0.40 + *) Fix proxy so that it is possible to access ftp: URLs via a proxy + chain. [Peter Van Biesen ] + *) mod-defalte now checks to make sure that 'gzip-only-text/html' is set to 1, so we can exclude things from the general case with browsermatch. [Ian Holsman, Andre Schild ] 1.158 +2 -2 httpd-2.0/modules/proxy/proxy_http.c Index: proxy_http.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- proxy_http.c 15 Jul 2002 07:46:19 -0000 1.157 +++ proxy_http.c 8 Aug 2002 17:59:18 -0000 1.158 @@ -1032,10 +1032,10 @@ } is_ssl = 1; } - else if (strncasecmp(url, "http:", 5)) { + else if (!(strncasecmp(url, "http:", 5)==0 || (strncasecmp(url, "ftp:", 4)==0 && proxyname))) { ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: HTTP: declining URL %s", url); - return DECLINED; /* only interested in HTTP */ + return DECLINED; /* only interested in HTTP, or FTP via proxy */ } ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: HTTP: serving URL %s", url);