Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 54099 invoked by uid 500); 16 Mar 2001 05:49:53 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 54088 invoked by uid 500); 16 Mar 2001 05:49:52 -0000 Delivered-To: apmail-httpd-proxy-cvs@apache.org Date: 16 Mar 2001 05:49:52 -0000 Message-ID: <20010316054952.54079.qmail@apache.org> From: chuck@apache.org To: httpd-proxy-cvs@apache.org Subject: cvs commit: httpd-proxy/module-2.0 proxy_util.c chuck 01/03/15 21:49:52 Modified: . CHANGES module-2.0 proxy_util.c Log: change INADDR_NONE to APR_INADDR_NONE Submitted by: Ian Holsman Reviewed by: Chuck Murcko Revision Changes Path 1.8 +2 -0 httpd-proxy/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-proxy/CHANGES,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- CHANGES 2001/03/14 21:16:38 1.7 +++ CHANGES 2001/03/16 05:49:51 1.8 @@ -1,6 +1,8 @@ mod_proxy changes for 2.0.15 current + *) replace INADDR_NONE with APR_INADDR_NONE [Ian Holsman ] + *) Fix problem with proxy configuration where globally set configuration options were overridden inside virtual hosts. [Graham Leggett ] 1.43 +1 -1 httpd-proxy/module-2.0/proxy_util.c Index: proxy_util.c =================================================================== RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_util.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- proxy_util.c 2001/03/14 21:16:41 1.42 +++ proxy_util.c 2001/03/16 05:49:51 1.43 @@ -739,7 +739,7 @@ inet_ntoa(This->addr), bits); } - This->mask.s_addr = htonl(INADDR_NONE << (32 - bits)); + This->mask.s_addr = htonl(APR_INADDR_NONE << (32 - bits)); if (*addr == '\0' && (This->addr.s_addr & ~This->mask.s_addr) != 0) { ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,