Author: kkolinko Date: Mon Aug 1 09:41:53 2011 New Revision: 1152716 URL: http://svn.apache.org/viewvc?rev=1152716&view=rev Log: 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.
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java tomcat/trunk/webapps/docs/config/valve.xml Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1152716&r1=1152715&r2=1152716&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Mon Aug 1 09:41:53 2011 @@ -72,7 +72,8 @@ import org.apache.tomcat.util.buf.B2CCon * <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 Modified: tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=1152716&r1=1152715&r2=1152716&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java Mon Aug 1 09:41:53 2011 @@ -49,7 +49,8 @@ import org.apache.tomcat.util.ExceptionU * * 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> Modified: tomcat/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1152716&r1=1152715&r2=1152716&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/trunk/webapps/docs/config/valve.xml Mon Aug 1 09:41:53 2011 @@ -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> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org