diff options
Diffstat (limited to 'www-apache/mod_geoip2/files')
| -rw-r--r-- | www-apache/mod_geoip2/files/30_mod_geoip2.conf | 5 | ||||
| -rw-r--r-- | www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch | 35 |
2 files changed, 40 insertions, 0 deletions
diff --git a/www-apache/mod_geoip2/files/30_mod_geoip2.conf b/www-apache/mod_geoip2/files/30_mod_geoip2.conf new file mode 100644 index 000000000000..41206ad7ba0a --- /dev/null +++ b/www-apache/mod_geoip2/files/30_mod_geoip2.conf @@ -0,0 +1,5 @@ +<IfDefine GEOIP> +LoadModule geoip_module modules/mod_geoip.so +</IfDefine> + +# vim: ts=4 filetype=apache diff --git a/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch b/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch new file mode 100644 index 000000000000..563e35b1137e --- /dev/null +++ b/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-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); |