apache1-mod_rpaf_degtine.patch

   1 --- mod_rpaf-0.5.orig/mod_rpaf-2.0.c    2004-03-17 17:47:30.000000000 +0200
   2 +++ mod_rpaf-0.5/mod_rpaf-2.0.c 2007-09-27 13:23:45.335194758 +0300
   3 @@ -130,6 +130,16 @@
   4      return 0;
   5  }
   6
   7 +static char* last_not_in_array(apr_array_header_t *forwarded_for,
   8 +                              apr_array_header_t *proxy_ips) {
   9 +    int i;
  10 +    for (i = (forwarded_for->nelts)-1; i > 0; i--) {
  11 +       if (!is_in_array(((char **)forwarded_for->elts)[i], proxy_ips))
  12 +           break;
  13 +    }
  14 +    return ((char **)forwarded_for->elts)[i];
  15 +}
  16 +
  17  static int change_remote_ip(request_rec *r) {
  18      const char *fwdvalue;
  19      char *val;
  20 @@ -147,7 +157,7 @@
  21                  if (*fwdvalue != '\0')
  22                      ++fwdvalue;
  23              }
  24 -            r->connection->remote_ip = apr_pstrdup(r->connection->pool, ((char **)arr->elts)[((arr->nelts)-1)]);
  25 +            r->connection->remote_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
  26              r->connection->remote_addr->sa.sin.sin_addr.s_addr = inet_addr(r->connection->remote_ip);
  27              if (cfg->sethostname) {
  28                  const char *hostvalue;
  29 --- mod_rpaf-0.5.orig/mod_rpaf.c        2007-09-27 13:23:30.864865219 +0300
  30 +++ mod_rpaf-0.5/mod_rpaf.c     2007-09-27 13:23:59.885526119 +0300
  31 @@ -130,6 +130,16 @@
  32      return 0;
  33  }
  34
  35 +static char* last_not_in_array(array_header *forwarded_for,
  36 +                              array_header *proxy_ips) {
  37 +    int i;
  38 +    for (i = (forwarded_for->nelts)-1; i > 0; i--) {
  39 +       if (!is_in_array(((char **)forwarded_for->elts)[i], proxy_ips))
  40 +           break;
  41 +    }
  42 +    return ((char **)forwarded_for->elts)[i];
  43 +}
  44 +
  45  static int change_remote_ip(request_rec *r) {
  46      const char *fwdvalue;
  47      char *val;
  48 @@ -147,7 +157,7 @@
  49                  if (*fwdvalue != '\0')
  50                      ++fwdvalue;
  51              }
  52 -            r->connection->remote_ip = ap_pstrdup(r->connection->pool, ((char **)arr->elts)[((arr->nelts)-1)]);
  53 +            r->connection->remote_ip = ap_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
  54                         switch (r->connection->remote_addr.ss_family) {
  55                         case AF_INET:
  56                                 inet_pton(AF_INET, r->connection->remote_ip, &((struct sockaddr_in*)&r->connection->remote_addr)->sin_addr.s_addr);