From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 12 Feb 2016 22:08:29 +0000 (+0000)
Subject: Support %{c}h for conn-hostname, %h for useragent_host
X-Git-Tag: 2.5.0-alpha~2084
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aae25185addfbae48bb13dff1d379c36f3e3ad15;p=thirdparty%2Fapache%2Fhttpd.git

Support %{c}h for conn-hostname, %h for useragent_host

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730129 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index e961c930050..4351bc507da 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -339,9 +339,15 @@ static const char *constant_item(request_rec *dummy, char *stuff)
 
 static const char *log_remote_host(request_rec *r, char *a)
 {
-    return ap_escape_logitem(r->pool, ap_get_remote_host(r->connection,
-                                                         r->per_dir_config,
-                                                         REMOTE_NAME, NULL));
+    const char *remote_host;
+    if (a && !strcmp(a, "c")) {
+        remote_host = ap_get_remote_host(r->connection, r->per_dir_config,
+                                         REMOTE_NAME, NULL);
+    }
+    else {
+        remote_host = ap_get_useragent_host(r, REMOTE_NAME, NULL);
+    }
+    return ap_escape_logitem(r->pool, remote_host);
 }
 
 static const char *log_remote_address(request_rec *r, char *a)