From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 27 Sep 2007 10:09:36 +0000 (+0000)
Subject: revision 1.1
X-Git-Tag: auto/ac/apache-mod_rpaf-0_5-4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache1-mod_rpaf.git;a=commitdiff_plain;h=11a22cd70866c84a8eb6e0dfd75807b0024325c5

revision 1.1
date: 2007/09/26 14:56:57;  author: alpha;  state: Exp;
- "degtine" stands for "vodka" in .lt
- see http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg210747.html

Changed files:
    mod_rpaf_degtine.patch -> 1.1
---

diff --git a/mod_rpaf_degtine.patch b/mod_rpaf_degtine.patch
new file mode 100644
index 0000000..f8f7fd1
--- /dev/null
+++ b/mod_rpaf_degtine.patch
@@ -0,0 +1,59 @@
+diff -ur mod_rpaf-0.5/mod_rpaf-2.0.c libapache-mod-rpaf-0.5/mod_rpaf-2.0.c
+--- mod_rpaf-0.5/mod_rpaf-2.0.c	2004-03-17 15:47:30.000000000 +0000
++++ libapache-mod-rpaf-0.5/mod_rpaf-2.0.c	2006-06-16 18:04:05.000000000 +0100
+@@ -130,6 +130,16 @@
+     return 0;
+ }
+ 
++static char* last_not_in_array(apr_array_header_t *forwarded_for,
++			       apr_array_header_t *proxy_ips) {
++    int i;
++    for (i = (forwarded_for->nelts)-1; i > 0; i--) {
++	if (!is_in_array(((char **)forwarded_for->elts)[i], proxy_ips))
++	    break;
++    }
++    return ((char **)forwarded_for->elts)[i];
++}
++
+ static int change_remote_ip(request_rec *r) {
+     const char *fwdvalue;
+     char *val;
+@@ -147,7 +157,7 @@
+                 if (*fwdvalue != '\0')
+                     ++fwdvalue;
+             }
+-            r->connection->remote_ip = apr_pstrdup(r->connection->pool, ((char **)arr->elts)[((arr->nelts)-1)]);
++            r->connection->remote_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
+             r->connection->remote_addr->sa.sin.sin_addr.s_addr = inet_addr(r->connection->remote_ip);
+             if (cfg->sethostname) {
+                 const char *hostvalue;
+diff -ur mod_rpaf-0.5/mod_rpaf.c libapache-mod-rpaf-0.5/mod_rpaf.c
+--- mod_rpaf-0.5/mod_rpaf.c	2004-03-17 15:47:30.000000000 +0000
++++ libapache-mod-rpaf-0.5/mod_rpaf.c	2006-06-16 18:04:38.000000000 +0100
+@@ -130,6 +130,16 @@
+     return 0;
+ }
+ 
++static char* last_not_in_array(array_header *forwarded_for,
++			       array_header *proxy_ips) {
++    int i;
++    for (i = (forwarded_for->nelts)-1; i > 0; i--) {
++	if (!is_in_array(((char **)forwarded_for->elts)[i], proxy_ips))
++	    break;
++    }
++    return ((char **)forwarded_for->elts)[i];
++}
++
+ static int change_remote_ip(request_rec *r) {
+     const char *fwdvalue;
+     char *val;
+@@ -147,7 +157,7 @@
+                 if (*fwdvalue != '\0')
+                     ++fwdvalue;
+             }
+-            r->connection->remote_ip = ap_pstrdup(r->connection->pool, ((char **)arr->elts)[((arr->nelts)-1)]);
++            r->connection->remote_ip = ap_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
+             r->connection->remote_addr.sin_addr.s_addr = inet_addr(r->connection->remote_ip);
+             if (cfg->sethostname) {
+                 const char *hostvalue;
+