diff --git a/apache/configure.in b/apache/configure.in index beb9274..f1e0a46 100644 --- a/apache/configure.in +++ b/apache/configure.in @@ -43,6 +43,8 @@ APACHE_DIR # The AC_SUBST macro causes the variable to be saved in config.status AC_SUBST(apache_dir) +AC_CHECK_MEMBER(conn_rec.client_ip, AC_DEFINE(USE_CONN_REC_CLIENT_IP,1,[Do we have conn_rec.client_ip]),,[#include "httpd.h"]) + # Write config.status and the Makefile AC_OUTPUT(Makefile) diff --git a/apache/mod_blockinator.c b/apache/mod_blockinator.c index 1aba422..9ebdd06 100644 --- a/apache/mod_blockinator.c +++ b/apache/mod_blockinator.c @@ -1,5 +1,5 @@ /* - * mod_blockinator for Apache v2.2 + * mod_blockinator for Apache v2.4 * * Author: Scott Wallace * Date: March 2012 @@ -21,6 +21,10 @@ module AP_MODULE_DECLARE_DATA blockinator_module; +#ifdef APLOG_USE_MODULE +APLOG_USE_MODULE(blockinator); +#endif + /* * Global variables for use everywhere */ @@ -61,7 +65,11 @@ static int mod_blockinator_method_handler(request_rec *r) int sqlite3_rc; /* Capture the relevant information from the inbound request */ - remote_ip = r->connection->remote_ip; +#ifdef USE_CONN_REC_CLIENT_IP + remote_ip = r->connection->client_ip, +#else + remote_ip = r->connection->remote_ip, +#endif forwarded_ip = apr_table_get(r->headers_in, "X-Forwarded-For"); useragent = apr_table_get(r->headers_in, "User-Agent");