From ef3bb6f54b34d79ff266801082a453204fc7bf6b Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 1 Aug 2011 09:41:53 +0000
Subject: [PATCH] Additional comments about resolveHosts attribute of
 AccessLogValve. - The resolveHosts attribute could be used to change the
 meaning of "common" and "combined" patterns (as it still does in
 JDBCAccessLogValve), so I mentioned in the docs what to do when that is what
 the admin wants. - Align Javadoc with Configuration Reference. - Mention the
 effect of enableLookups attribute of connector on ExtendedAccessLogValve.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152716 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/valves/AccessLogValve.java         | 3 ++-
 java/org/apache/catalina/valves/ExtendedAccessLogValve.java | 3 ++-
 webapps/docs/config/valve.xml                               | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java
index 0b6e8e5a0..c7570aa26 100644
--- a/java/org/apache/catalina/valves/AccessLogValve.java
+++ b/java/org/apache/catalina/valves/AccessLogValve.java
@@ -72,7 +72,8 @@ import org.apache.tomcat.util.buf.B2CConverter;
  * <li><b>%b</b> - Bytes sent, excluding HTTP headers, or '-' if no bytes
  *     were sent
  * <li><b>%B</b> - Bytes sent, excluding HTTP headers
- * <li><b>%h</b> - Remote host name
+ * <li><b>%h</b> - Remote host name (or IP address if
+ * <code>enableLookups</code> for the connector is false)
  * <li><b>%H</b> - Request protocol
  * <li><b>%l</b> - Remote logical username from identd (always returns '-')
  * <li><b>%m</b> - Request method
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 50f8382d0..5cfc290ab 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -49,7 +49,8 @@ import org.apache.tomcat.util.ExceptionUtils;
  *
  * The following fields are supported:
  * <ul>
- * <li><code>c-dns</code>:  Client hostname</li>
+ * <li><code>c-dns</code>:  Client hostname (or ip address if
+ * <code>enableLookups</code> for the connector is false)</li>
  * <li><code>c-ip</code>:  Client ip address</li>
  * <li><code>bytes</code>:  bytes served</li>
  * <li><code>cs-method</code>:  request method</li>
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index d58703eef..6af03e693 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -149,6 +149,9 @@
       <attribute name="resolveHosts" required="false">
         <p>This attribute is no longer supported. Use the connector
         attribute <code>enableLookups</code> instead.</p>
+        <p>If you have <code>enableLookups</code> on the connector set to
+        <code>true</code> and want to ignore it, use <b>%a</b> instead of
+        <b>%h</b> in the value of <code>pattern</code>.</p>
       </attribute>
 
       <attribute name="suffix" required="false">
@@ -399,7 +402,8 @@
     <p>The following format tokens are supported:</p>
     <ul>
     <li><b>bytes</b> - Bytes sent, excluding HTTP headers, or '-' if zero</li>
-    <li><b>c-dns</b> - Remote host name</li>
+    <li><b>c-dns</b> - Remote host name (or IP address if
+        <code>enableLookups</code> for the connector is false)</li>
     <li><b>c-ip</b> - Remote IP address</li>
     <li><b>cs-method</b> - Request method (GET, POST, etc.)</li>
     <li><b>cs-uri</b> - Request URI</li>
-- 
2.11.0