Description: Handle conn_rec->remote_ip split in Apache 2.4
Author: Colin Watson <cjwatson@debian.org>
Forwarded: no
Last-Update: 2013-07-08

Index: b/mod_defensible.c
===================================================================
--- a/mod_defensible.c
+++ b/mod_defensible.c
@@ -73,8 +73,10 @@
 #if AP_SERVER_MAJORVERSION_NUMBER > 2 || \
     (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER >= 4)
 #define GET_SERVER_BANNER ap_get_server_banner
+#define CLIENT_IP(conn) ((conn)->client_ip)
 #else
 #define GET_SERVER_BANNER ap_get_server_version
+#define CLIENT_IP(conn) ((conn)->remote_ip)
 #endif
 
 /* Callback function called when we get DnsblUse option */
@@ -209,7 +211,7 @@
 static int check_dnsbl_access(request_rec *r)
 {
     char **srv_elts;
-    char *ip = r->connection->remote_ip;
+    char *ip = CLIENT_IP(r->connection);
     int i;
 
     dnsbl_config *conf = (dnsbl_config *)