apache-mod_rpaf-apache24.patch

   1 --- mod_rpaf-0.6/mod_rpaf.c.orig        2013-05-05 21:59:10.551469220 +0200
   2 +++ mod_rpaf-0.6/mod_rpaf.c     2013-05-05 22:00:23.974802023 +0200
   3 @@ -147,8 +147,8 @@
   4
   5  static apr_status_t rpaf_cleanup(void *data) {
   6      rpaf_cleanup_rec *rcr = (rpaf_cleanup_rec *)data;
   7 -    rcr->r->connection->remote_ip   = apr_pstrdup(rcr->r->connection->pool, rcr->old_ip);
   8 -    rcr->r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(rcr->r->connection->remote_ip);
   9 +    rcr->r->connection->client_ip   = apr_pstrdup(rcr->r->connection->pool, rcr->old_ip);
  10 +    rcr->r->useragent_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(rcr->r->connection->client_ip);
  11      return APR_SUCCESS;
  12  }
  13
  14 @@ -171,7 +171,7 @@
  15      if (!cfg->enable)
  16          return DECLINED;
  17
  18 -    if (is_in_array(r->connection->remote_ip, cfg->proxy_ips) == 1) {
  19 +    if (is_in_array(r->connection->client_ip, cfg->proxy_ips) == 1) {
  20          /* check if cfg->headername is set and if it is use
  21             that instead of X-Forwarded-For by default */
  22          if (cfg->headername && (fwdvalue = apr_table_get(r->headers_in, cfg->headername))) {
  23 @@ -190,11 +190,11 @@
  24                  if (*fwdvalue != '\0')
  25                      ++fwdvalue;
  26              }
  27 -            rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->remote_ip);
  28 +            rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->client_ip);
  29              rcr->r = r;
  30              apr_pool_cleanup_register(r->pool, (void *)rcr, rpaf_cleanup, apr_pool_cleanup_null);
  31 -            r->connection->remote_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
  32 -            r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->remote_ip);
  33 +            r->connection->client_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
  34 +            r->useragent_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->client_ip);
  35              if (cfg->sethostname) {
  36                  const char *hostvalue;
  37                  if (hostvalue = apr_table_get(r->headers_in, "X-Forwarded-Host")) {