diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2019-10-17 14:22:10 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2019-10-17 14:22:10 +0200 |
| commit | fa86d9cd1287fafdf6f69170b38cec62159ee6a2 (patch) | |
| tree | bfd536ec7abfb6e031dde2935f20df12281b6458 /www-apache/mod_geoip2/files | |
| parent | www-apache/mod_flvx: Remove last-rited pkg (diff) | |
| download | gentoo-fa86d9cd1287fafdf6f69170b38cec62159ee6a2.tar.gz gentoo-fa86d9cd1287fafdf6f69170b38cec62159ee6a2.tar.bz2 gentoo-fa86d9cd1287fafdf6f69170b38cec62159ee6a2.zip | |
www-apache/mod_geoip2: Remove last-rited pkg
Closes: https://bugs.gentoo.org/694608
Signed-off-by: Michał Górny <mgorny@gentoo.org>
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, 0 insertions, 40 deletions
diff --git a/www-apache/mod_geoip2/files/30_mod_geoip2.conf b/www-apache/mod_geoip2/files/30_mod_geoip2.conf deleted file mode 100644 index 41206ad7ba0a..000000000000 --- a/www-apache/mod_geoip2/files/30_mod_geoip2.conf +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index 563e35b1137e..000000000000 --- a/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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); |