-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
+--- mod_rpaf-0.6/mod_rpaf-2.0.c~ 2008-01-14 12:22:30.000000000 +0200
++++ mod_rpaf-0.6/mod_rpaf-2.0.c 2008-01-14 12:24:24.311847900 +0200
@@ -130,6 +130,16 @@
return 0;
}
static int change_remote_ip(request_rec *r) {
const char *fwdvalue;
char *val;
-@@ -147,7 +157,7 @@
- if (*fwdvalue != '\0')
- ++fwdvalue;
- }
+@@ -193,7 +193,7 @@
+ rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->remote_ip);
+ rcr->r = r;
+ apr_pool_cleanup_register(r->pool, (void *)rcr, rpaf_cleanup, apr_pool_cleanup_null);
- 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);
+ r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_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
+--- mod_rpaf-0.6/mod_rpaf.c~ 2008-01-14 12:25:04.000000000 +0200
++++ mod_rpaf-0.6/mod_rpaf.c 2008-01-14 12:25:28.975575680 +0200
@@ -130,6 +130,16 @@
return 0;
}
static int change_remote_ip(request_rec *r) {
const char *fwdvalue;
char *val;
-@@ -147,7 +157,7 @@
- if (*fwdvalue != '\0')
- ++fwdvalue;
- }
+@@ -192,7 +192,7 @@
+ rcr->old_ip = ap_pstrdup(r->connection->pool, r->connection->remote_ip);
+ rcr->r = r;
+ ap_register_cleanup(r->pool, (void *)rcr, rpaf_cleanup, ap_null_cleanup);
- 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;
-