Author: violetagg
Date: Wed Sep 3 09:06:07 2014
New Revision: 1622189
URL: http://svn.apache.org/r1622189
Log:
Merged revision 1622187 from tomcat/trunk:
Correct the information written by ExtendedAccessLogValve when a format token
x-O(XXX) is used so that multiple values for a header XXX are separated by
commas. Identified by Coverity Scan.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1622187
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=1622189&r1=1622188&r2=1622189&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
Wed Sep 3 09:06:07 2014
@@ -358,7 +358,9 @@ public class ExtendedAccessLogValve exte
StringBuilder buffer = new StringBuilder();
boolean first = true;
while (iter.hasNext()) {
- if (!first) {
+ if (first) {
+ first = false;
+ } else {
buffer.append(",");
}
buffer.append(iter.next());
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1622189&r1=1622188&r2=1622189&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 3 09:06:07 2014
@@ -112,6 +112,12 @@
Fixed the multipart elements merge operation performed during web
application deployment. Identified by Coverity Scan. (violetagg)
</fix>
+ <fix>
+ Correct the information written by
+ <code>ExtendedAccessLogValve</code> when a format token x-O(XXX) is
+ used so that multiple values for a header XXX are separated by commas.
+ Identified by Coverity Scan. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
