summaryrefslogtreecommitdiffstats
path: root/nss_engine_io.c
diff options
context:
space:
mode:
Diffstat (limited to 'nss_engine_io.c')
-rw-r--r--nss_engine_io.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/nss_engine_io.c b/nss_engine_io.c
index f1ac69c..1360748 100644
--- a/nss_engine_io.c
+++ b/nss_engine_io.c
@@ -621,13 +621,21 @@ static apr_status_t nss_filter_io_shutdown(nss_filter_ctx_t *filter_ctx,
PR_Close(ssl);
/* log the fact that we've closed the connection */
+#if AP_SERVER_MINORVERSION_NUMBER <= 2
+ if (c->base_server->loglevel >= APLOG_INFO) {
+#else
if (c->base_server->log.level >= APLOG_INFO) {
+#endif
ap_log_error(APLOG_MARK, APLOG_INFO, 0, c->base_server,
"Connection to child %ld closed "
"(server %s, client %s)",
c->id,
nss_util_vhostid(c->pool, c->base_server),
+#if AP_SERVER_MINORVERSION_NUMBER <= 2
+ c->remote_ip ? c->remote_ip : "unknown");
+#else
c->client_ip ? c->client_ip : "unknown");
+#endif
}
/* deallocate the SSL connection */
@@ -1167,7 +1175,11 @@ static PRStatus PR_CALLBACK nspr_filter_getpeername(PRFileDesc *fd, PRNetAddr *a
filter_ctx = (nss_filter_ctx_t *)(fd->secret);
c = filter_ctx->c;
+#if AP_SERVER_MINORVERSION_NUMBER <= 2
+ return PR_StringToNetAddr(c->remote_ip, addr);
+#else
return PR_StringToNetAddr(c->client_ip, addr);
+#endif
}
/*