summaryrefslogtreecommitdiff
path: root/modules/loggers
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2016-02-12 22:08:29 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2016-02-12 22:08:29 +0000
commitaae25185addfbae48bb13dff1d379c36f3e3ad15 (patch)
treec34edb0541846bdaf78c403a2224b7a4973614c8 /modules/loggers
parent6b699156cdb8e72ff6ad645ea601e8deeaae1064 (diff)
downloadhttpd-aae25185addfbae48bb13dff1d379c36f3e3ad15.tar.gz
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
Diffstat (limited to 'modules/loggers')
-rw-r--r--modules/loggers/mod_log_config.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index e961c93005..4351bc507d 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)