1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## 30_conn_rec_remote_ip.dpatch by Colin Watson <cjwatson@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Handle conn_rec->remote_ip split in Apache 2.4.
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libapache-mod-removeip-1.0b~/apache2.0/mod_removeip.c libapache-mod-removeip-1.0b/apache2.0/mod_removeip.c
--- libapache-mod-removeip-1.0b~/apache2.0/mod_removeip.c 2013-07-08 17:57:04.000000000 +0100
+++ libapache-mod-removeip-1.0b/apache2.0/mod_removeip.c 2013-07-08 18:10:17.968578696 +0100
@@ -38,8 +38,16 @@
if (!cfg->enable)
return DECLINED;
+#if AP_SERVER_MAJORVERSION_NUMBER > 2 || \
+ (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER >= 4)
+ r->connection->client_ip = apr_pstrdup(r->connection->pool, "127.0.0.1");
+ r->connection->client_addr->sa.sin.sin_addr.s_addr = inet_addr("127.0.0.1");
+ r->useragent_ip = apr_pstrdup(r->connection->pool, "127.0.0.1");
+ r->useragent_addr->sa.sin.sin_addr.s_addr = inet_addr("127.0.0.1");
+#else
r->connection->remote_ip = apr_pstrdup(r->connection->pool, "127.0.0.1");
r->connection->remote_addr->sa.sin.sin_addr.s_addr = inet_addr("127.0.0.1");
+#endif
return DECLINED;
}
|
