From f1563ef167b31039dbc8b1e47c6ba6d958b8dc66 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 4 Apr 2011 01:19:13 +0000
Subject: [PATCH] Implement display of multiple request headers in
 AccessLogValve: print not just the value of the first header, but of the all
 of them, separated by commas.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1088460 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/valves/AccessLogValve.java | 14 +++++++++-----
 webapps/docs/changelog.xml                          |  5 +++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java
index 3129f88ac..b13e7ce18 100644
--- a/java/org/apache/catalina/valves/AccessLogValve.java
+++ b/java/org/apache/catalina/valves/AccessLogValve.java
@@ -28,6 +28,7 @@ import java.net.InetAddress;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.TimeZone;
@@ -1241,12 +1242,15 @@ public class AccessLogValve extends ValveBase implements AccessLog {
         @Override
         public void addElement(StringBuilder buf, Date date, Request request,
                 Response response, long time) {
-            String value = request.getHeader(header);
-            if (value == null) {
-                buf.append('-');
-            } else {
-                buf.append(value);
+            Enumeration<String> iter = request.getHeaders(header);
+            if (iter.hasMoreElements()) {
+                buf.append(iter.nextElement());
+                while (iter.hasMoreElements()) {
+                    buf.append(',').append(iter.nextElement());
+                }
+                return;
             }
+            buf.append('-');
         }
     }
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 63d5f671f..159c98606 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -51,6 +51,11 @@
       <fix>
         Fix display of response headers in AccessLogValve. (kkolinko)
       </fix>
+      <update>
+        Implement display of multiple request headers in AccessLogValve:
+        print not just the value of the first header, but of the all of them,
+        separated by commas. (kkolinko)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Web applications">
-- 
2.11.0