SOURCES: mod_rpaf_degtine.patch - update to 0.6

[glen]

Author: glen                         Date: Mon Jan 14 10:27:20 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update to 0.6

---- Files affected:
SOURCES:
   mod_rpaf_degtine.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mod_rpaf_degtine.patch
diff -u SOURCES/mod_rpaf_degtine.patch:1.1 SOURCES/mod_rpaf_degtine.patch:1.2
--- SOURCES/mod_rpaf_degtine.patch:1.1	Thu Sep 27 12:09:36 2007
+++ SOURCES/mod_rpaf_degtine.patch	Mon Jan 14 11:27:14 2008
@@ -1,6 +1,5 @@
-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;
  }
@@ -18,18 +17,17 @@
  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;
  }
@@ -47,13 +45,12 @@
  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;
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mod_rpaf_degtine.patch?r1=1.1&r2=1.2&f=u