diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-11-17 07:52:01 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-11-17 07:52:01 +0100 |
| commit | 090533c0feab2d8e7930393a036bb6d027adffa6 (patch) | |
| tree | 53595b39fb80e0a7bd0eba6af22c66711680047c /mod_geoip-1.2.5-httpd24.patch | |
| parent | 2fa9febbade5d597e684ce84c17559416b9bf19d (diff) | |
Diffstat (limited to 'mod_geoip-1.2.5-httpd24.patch')
| -rw-r--r-- | mod_geoip-1.2.5-httpd24.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/mod_geoip-1.2.5-httpd24.patch b/mod_geoip-1.2.5-httpd24.patch new file mode 100644 index 0000000..563e35b --- /dev/null +++ b/mod_geoip-1.2.5-httpd24.patch @@ -0,0 +1,35 @@ +--- mod_geoip.c.geoip ++++ mod_geoip.c +@@ -66,6 +66,7 @@ + #include "http_config.h" + #include "http_protocol.h" + #include "http_log.h" ++#include "util_script.h" + #include "ap_config.h" + #include "apr_strings.h" + #include <GeoIP.h> +@@ -320,7 +321,11 @@ + return DECLINED; + + if (!cfg->scanProxyHeaders) { ++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0) ++ ipaddr = r->useragent_ip; ++#else + ipaddr = r->connection->remote_ip; ++#endif + } + else { + ap_add_common_vars(r); +@@ -338,7 +343,11 @@ + } + if (!ipaddr_ptr) { + ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, "[mod_geoip]: Error while getting ipaddr from proxy headers. Using REMOTE_ADDR."); +- ipaddr = r->connection->remote_ip; ++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0) ++ ipaddr = r->useragent_ip; ++#else ++ ipaddr = r->connection->remote_ip; ++#endif + } + else { + ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, "[mod_geoip]: IPADDR_PTR: %s", ipaddr_ptr); |