apache-mod_perl/0016-remote_ip-renamed-to-client_ip.patch

37 lines
1.3 KiB
Diff

From d23ec0b35fd2c09ba07ca66b19d8fb4f5bb11c44 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <hanzz.k@gmail.com>
Date: Mon, 4 Jun 2012 13:17:03 +0200
Subject: [PATCH 16/28] remote_ip renamed to client_ip
---
src/modules/perl/modperl_interp.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/modules/perl/modperl_interp.c b/src/modules/perl/modperl_interp.c
index dfff32e..6ec9b56 100644
--- a/src/modules/perl/modperl_interp.c
+++ b/src/modules/perl/modperl_interp.c
@@ -496,11 +496,19 @@ modperl_interp_t *modperl_interp_select(request_rec *r, conn_rec *c,
set_interp(p);
+#if AP_SERVER_MAJORVERSION_NUMBER >= 2 && AP_SERVER_MINORVERSION_NUMBER >= 4
+ MP_TRACE_i(MP_FUNC,
+ "set interp 0x%lx in %s 0x%lx (%s request for %s)\n",
+ (unsigned long)interp, desc, (unsigned long)p,
+ (r ? (is_subrequest ? "sub" : "main") : "conn"),
+ (r ? r->uri : c->client_ip));
+#else
MP_TRACE_i(MP_FUNC,
"set interp 0x%lx in %s 0x%lx (%s request for %s)\n",
(unsigned long)interp, desc, (unsigned long)p,
(r ? (is_subrequest ? "sub" : "main") : "conn"),
(r ? r->uri : c->remote_ip));
+#endif
}
/* set context (THX) for this thread */
--
1.7.11.4