From 968c9e27f0283a7abfc22525bf4c95252bd0f88d Mon Sep 17 00:00:00 2001 From: cvs2git Date: Thu, 8 Feb 2007 14:16:43 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'unlabeled-1.17.2'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sprout from master 2007-02-08 14:16:43 UTC Elan Ruusamäe '- Provide apache(mod_rpaf); rel 5' Delete: apache1-mod_rpaf-ipv6.patch apache1-mod_rpaf.conf --- apache1-mod_rpaf-ipv6.patch | 23 ----------------------- apache1-mod_rpaf.conf | 18 ------------------ 2 files changed, 41 deletions(-) delete mode 100644 apache1-mod_rpaf-ipv6.patch delete mode 100644 apache1-mod_rpaf.conf diff --git a/apache1-mod_rpaf-ipv6.patch b/apache1-mod_rpaf-ipv6.patch deleted file mode 100644 index 55f6b7c..0000000 --- a/apache1-mod_rpaf-ipv6.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur mod_rpaf-0.5/mod_rpaf.c mod_rpaf-0.5.ipv6/mod_rpaf.c ---- mod_rpaf-0.5/mod_rpaf.c 2004-03-17 17:47:30.000000000 +0200 -+++ mod_rpaf-0.5.ipv6/mod_rpaf.c 2006-01-05 18:18:09.000000000 +0200 -@@ -148,7 +148,18 @@ - ++fwdvalue; - } - r->connection->remote_ip = ap_pstrdup(r->connection->pool, ((char **)arr->elts)[((arr->nelts)-1)]); -- r->connection->remote_addr.sin_addr.s_addr = inet_addr(r->connection->remote_ip); -+ switch (r->connection->remote_addr.ss_family) { -+ case AF_INET: -+ inet_pton(AF_INET, r->connection->remote_ip, &((struct sockaddr_in*)&r->connection->remote_addr)->sin_addr.s_addr); -+ break; -+ case AF_INET6: -+ inet_pton(AF_INET6, r->connection->remote_ip, ((struct sockaddr_in6*)&r->connection->remote_addr)->sin6_addr.s6_addr); -+ break; -+ default: -+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, r, "Apache doesn't support this address family"); -+ break; -+ } -+ - if (cfg->sethostname) { - const char *hostvalue; - if (hostvalue = ap_table_get(r->headers_in, "X-Forwarded-Host")) { diff --git a/apache1-mod_rpaf.conf b/apache1-mod_rpaf.conf deleted file mode 100644 index 6274345..0000000 --- a/apache1-mod_rpaf.conf +++ /dev/null @@ -1,18 +0,0 @@ -# $Id$ -LoadModule rpaf_module modules/mod_rpaf.so - -# mod_rpaf - reverse proxy add forward - - -# Enable reverse proxy add forward -#RPAFenable On - -# which ips are forwarding requests to us -#RPAFproxy_ips 127.0.0.1 10.0.0.1 - -# let rpaf update vhost settings -# allows to have the same hostnames as in the "real" -# configuration for the forwarding Apache -#RPAFsethostname Off - - -- 2.44.0