[Bug 56082] ConcurrentModificationException with org.apache.juli.ClassLoaderLogManager
https://issues.apache.org/bugzilla/show_bug.cgi?id=56082 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas ma...@apache.org --- Fixed in 6.0.x for 6.0.40 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1578799 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/juli/ClassLoaderLogManager.java test/org/apache/juli/TestClassLoaderLogManager.java webapps/docs/changelog.xml
Author: markt
Date: Tue Mar 18 09:42:35 2014
New Revision: 1578799
URL: http://svn.apache.org/r1578799
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56082
Fix thread safety issue in JULI's LogManager implementation
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/tc6.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1562742,1562746
Merged /tomcat/tc7.0.x/trunk:r1562748
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1578799r1=1578798r2=1578799view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 18 09:42:35 2014
@@ -28,12 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56082
- Concurrency issue in JULI's LogManager
- http://svn.apache.org/r1562748
- +1: markt, kkolinko, remm
- -1:
-
* Make the xmlBlockExternal option in Catalina and Jasper to be true by
default.
https://people.apache.org/~kkolinko/patches/2014-02-17_tc6_xmlBlockExternalTrue.patch
(backport of r1564747)
Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1578799r1=1578798r2=1578799view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Tue
Mar 18 09:42:35 2014
@@ -35,6 +35,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogManager;
@@ -676,7 +677,7 @@ public class ClassLoaderLogManager exten
protected static final class ClassLoaderLogInfo {
final LogNode rootNode;
-final MapString, Logger loggers = new HashMapString, Logger();
+final MapString, Logger loggers = new ConcurrentHashMapString,
Logger();
final MapString, Handler handlers = new HashMapString, Handler();
final Properties props = new Properties();
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java?rev=1578799r1=1578798r2=1578799view=diff
==
--- tomcat/tc6.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
(original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
Tue Mar 18 09:42:35 2014
@@ -14,11 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.juli;
import junit.framework.TestCase;
+import java.util.Collections;
+import java.util.Random;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+
+import org.junit.Assert;
+
/**
* Test cases for {@link ClassLoaderLogManager}.
*/
@@ -26,33 +32,117 @@ public class TestClassLoaderLogManager e
public void testReplace() {
ClassLoaderLogManager logManager = new ClassLoaderLogManager();
-assertEquals(, logManager.replace());
-assertEquals(${, logManager.replace(${));
-assertEquals(${undefinedproperty},
+Assert.assertEquals(, logManager.replace());
+Assert.assertEquals(${, logManager.replace(${));
+Assert.assertEquals(${undefinedproperty},
logManager.replace(${undefinedproperty}));
-assertEquals(
+Assert.assertEquals(
System.getProperty(line.separator)
+ System.getProperty(path.separator)
+ System.getProperty(file.separator),
logManager
.replace(${line.separator}${path.separator}${file.separator}));
-assertEquals(
+Assert.assertEquals(
foo + System.getProperty(file.separator) + bar
+ System.getProperty(line.separator)
+ System.getProperty(path.separator) + baz,
logManager
.replace(foo${file.separator}bar${line.separator}${path.separator}baz));
// BZ 51249
-assertEquals(
+
svn commit: r1578804 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/jasper/ java/org/apache/jasper/compiler/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Tue Mar 18 09:54:55 2014
New Revision: 1578804
URL: http://svn.apache.org/r1578804
Log:
Make the xmlBlockExternal option in Catalina and Jasper to be true by default.
Patch by kkolinko.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1578804r1=1578803r2=1578804view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 18 09:54:55 2014
@@ -28,12 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Make the xmlBlockExternal option in Catalina and Jasper to be true by
default.
-
https://people.apache.org/~kkolinko/patches/2014-02-17_tc6_xmlBlockExternalTrue.patch
- (backport of r1564747)
- +1: kkolinko, markt, remm
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56208
Restore validateXml option in Jasper.
Motivation: It is mentioned in documentation and some users complained on
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1578804r1=1578803r2=1578804view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Tue Mar 18 09:54:55 2014
@@ -260,9 +260,7 @@ public class ApplicationContext
return true;
}
if (Globals.JASPER_XML_BLOCK_EXTERNAL_INIT_PARAM.equals(name)) {
-if (context.getXmlBlockExternal()) {
-return true;
-} else if (Globals.IS_SECURITY_ENABLED) {
+if (!context.getXmlBlockExternal()) {
// System admin has explicitly changed the default
return false;
}
@@ -293,7 +291,7 @@ public class ApplicationContext
if (context.getTldValidation()) {
names.add(Globals.JASPER_XML_VALIDATION_TLD_INIT_PARAM);
}
-if (context.getXmlBlockExternal() || Globals.IS_SECURITY_ENABLED) {
+if (!context.getXmlBlockExternal()) {
names.add(Globals.JASPER_XML_BLOCK_EXTERNAL_INIT_PARAM);
}
return Collections.enumeration(names);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1578804r1=1578803r2=1578804view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue
Mar 18 09:54:55 2014
@@ -651,7 +651,7 @@ public class StandardContext
/**
* Attribute used to turn on/off the use of external entities.
*/
-private boolean xmlBlockExternal = Globals.IS_SECURITY_ENABLED;
+private boolean xmlBlockExternal = true;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1578804r1=1578803r2=1578804view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java Tue Mar 18 09:54:55
2014
@@ -125,6 +125,7 @@ public class JspC extends Task implement
protected static final String SWITCH_DUMP_SMAP = -dumpsmap;
protected static final String SWITCH_VALIDATE_TLD = -validateTld;
protected static final String SWITCH_BLOCK_EXTERNAL = -blockExternal;
+protected static final String SWITCH_NO_BLOCK_EXTERNAL =
-no-blockExternal;
protected static final String SHOW_SUCCESS =-s;
protected static final String LIST_ERRORS = -l;
svn commit: r1578810 - /tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
Author: violetagg Date: Tue Mar 18 10:13:55 2014 New Revision: 1578810 URL: http://svn.apache.org/r1578810 Log: Corrected link to Tomcat 8.0 documentation. Issue is reported via comments at apache.org Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1578810r1=1578809r2=1578810view=diff == --- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Mar 18 10:13:55 2014 @@ -128,7 +128,7 @@ /subsection subsection name=Inside the Apache Tomcat Container p - The Tomcat Connection pool is configured as a resource described in a href=http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html; target=_blankThe Tomcat JDBC documentation/a + The Tomcat Connection pool is configured as a resource described in a href=http://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html; target=_blankThe Tomcat JDBC documentation/a With the only difference being that you have to specify the codefactory/code attribute and set the value to codeorg.apache.tomcat.jdbc.pool.DataSourceFactory/code /p @@ -696,7 +696,7 @@ /section section name=Code Example - pOther examples of Tomcat configuration for JDBC usage can be found a href=http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html;in the Tomcat documentation/a. /p + pOther examples of Tomcat configuration for JDBC usage can be found a href=http://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html;in the Tomcat documentation/a. /p subsection name=Plain Ol' Java pHere is a simple example of how to create and use a data source./p source![CDATA[ import java.sql.Connection; @@ -903,7 +903,7 @@ section name=Building pWe build the JDBC pool code with 1.6, but it is backwards compatible down to 1.5 for runtime environment. For unit test, we use 1.6 and higher/p - pOther examples of Tomcat configuration for JDBC usage can be found a href=http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html;in the Tomcat documentation/a. /p + pOther examples of Tomcat configuration for JDBC usage can be found a href=http://tomcat.apache.org/tomcat-8.0-doc/jndi-datasource-examples-howto.html;in the Tomcat documentation/a. /p subsection name=Building from source pBuilding is pretty simple. The pool has a dependency on codetomcat-juli.jar/code and in case you want the codeSlowQueryReportJmx/code/p source![CDATA[ javac -classpath tomcat-juli.jar \ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1578811 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/doc/jdbc-pool.xml
Author: violetagg Date: Tue Mar 18 10:16:25 2014 New Revision: 1578811 URL: http://svn.apache.org/r1578811 Log: Merged revision 1578810 from tomcat/trunk: Corrected link to Tomcat 7.0 documentation. Issue is reported via comments at apache.org Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1578810 Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1578811r1=1578810r2=1578811view=diff == --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Tue Mar 18 10:16:25 2014 @@ -130,7 +130,7 @@ /subsection subsection name=Inside the Apache Tomcat Container p - The Tomcat Connection pool is configured as a resource described in a href=http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html; target=_blankThe Tomcat JDBC documentation/a + The Tomcat Connection pool is configured as a resource described in a href=http://tomcat.apache.org/tomcat-7.0-doc/jndi-datasource-examples-howto.html; target=_blankThe Tomcat JDBC documentation/a With the only difference being that you have to specify the codefactory/code attribute and set the value to codeorg.apache.tomcat.jdbc.pool.DataSourceFactory/code /p @@ -699,7 +699,7 @@ /section section name=Code Example - pOther examples of Tomcat configuration for JDBC usage can be found a href=http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html;in the Tomcat documentation/a. /p + pOther examples of Tomcat configuration for JDBC usage can be found a href=http://tomcat.apache.org/tomcat-7.0-doc/jndi-datasource-examples-howto.html;in the Tomcat documentation/a. /p subsection name=Plain Ol' Java pHere is a simple example of how to create and use a data source./p source @@ -916,7 +916,7 @@ section name=Building pWe build the JDBC pool code with 1.6, but it is backwards compatible down to 1.5 for runtime environment. For unit test, we use 1.6 and higher/p - pOther examples of Tomcat configuration for JDBC usage can be found a href=http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html;in the Tomcat documentation/a. /p + pOther examples of Tomcat configuration for JDBC usage can be found a href=http://tomcat.apache.org/tomcat-7.0-doc/jndi-datasource-examples-howto.html;in the Tomcat documentation/a. /p subsection name=Building from source pBuilding is pretty simple. The pool has a dependency on codetomcat-juli.jar/code and in case you want the codeSlowQueryReportJmx/code/p source - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1578812 - in /tomcat/trunk: java/org/apache/tomcat/util/buf/Ascii.java test/org/apache/tomcat/util/buf/TestAscii.java webapps/docs/changelog.xml
Author: markt
Date: Tue Mar 18 10:27:31 2014
New Revision: 1578812
URL: http://svn.apache.org/r1578812
Log:
Fix possible overflow when parsing long values from a byte array.
Added:
tomcat/trunk/test/org/apache/tomcat/util/buf/TestAscii.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java?rev=1578812r1=1578811r2=1578812view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/Ascii.java Tue Mar 18 10:27:31
2014
@@ -33,10 +33,11 @@ public final class Ascii {
*/
private static final boolean[] isDigit = new boolean[256];
+private static final long OVERFLOW_LIMIT = Long.MAX_VALUE / 10;
+
/*
* Initialize character translation and type tables.
*/
-
static {
for (int i = 0; i 256; i++) {
toLower[i] = (byte)i;
@@ -85,19 +86,12 @@ public final class Ascii {
}
long n = c - '0';
-long m;
-
while (--len 0) {
-if (!isDigit(c = b[off++])) {
-throw new NumberFormatException();
-}
-m = n * 10 + c - '0';
-
-if (m n) {
-// Overflow
-throw new NumberFormatException();
+if (isDigit(c = b[off++])
+(n OVERFLOW_LIMIT || (n == OVERFLOW_LIMIT (c - '0')
8))) {
+n = n * 10 + c - '0';
} else {
-n = m;
+throw new NumberFormatException();
}
}
Added: tomcat/trunk/test/org/apache/tomcat/util/buf/TestAscii.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestAscii.java?rev=1578812view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestAscii.java (added)
+++ tomcat/trunk/test/org/apache/tomcat/util/buf/TestAscii.java Tue Mar 18
10:27:31 2014
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.util.buf;
+
+import java.math.BigInteger;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestAscii {
+
+@Test
+public void testParseLong1() {
+String value = 9223372036854775807; // Long.MAX_VALUE
+byte[] bytes = value.getBytes();
+long result = Ascii.parseLong(bytes, 0, bytes.length);
+Assert.assertEquals(value, String.valueOf(result));
+}
+
+@Test(expected = NumberFormatException.class)
+public void testParseLong2() {
+byte[] bytes = 9223372036854775808.getBytes(); // Long.MAX_VALUE + 1
+long result = Ascii.parseLong(bytes, 0, bytes.length);
+Assert.fail(NumberFormatException expected, got: + result);
+}
+
+@Test(expected = NumberFormatException.class)
+public void testParseLong3() {
+byte[] bytes = 9223372036854775810.getBytes(); // Long.MAX_VALUE + 3
+long result = Ascii.parseLong(bytes, 0, bytes.length);
+Assert.fail(NumberFormatException expected, got: + result);
+}
+
+@Test(expected = NumberFormatException.class)
+public void testParseLong4() {
+BigInteger x = BigInteger.valueOf(50L).shiftLeft(32);
+byte[] bytes = String.valueOf(x).getBytes();
+long result = Ascii.parseLong(bytes, 0, bytes.length);
+Assert.fail(NumberFormatException expected, got: + result);
+}
+
+@Test
+public void testParseLong5() {
+String value = 9223372036854775806; // Long.MAX_VALUE - 1
+byte[] bytes = value.getBytes();
+long result = Ascii.parseLong(bytes, 0, bytes.length);
+Assert.assertEquals(value, String.valueOf(result));
+}
+
+
+}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1578812r1=1578811r2=1578812view=diff
svn commit: r1578813 - /tomcat/trunk/test/org/apache/tomcat/util/buf/TestAscii.java
Author: markt Date: Tue Mar 18 10:30:57 2014 New Revision: 1578813 URL: http://svn.apache.org/r1578813 Log: Fix properties Modified: tomcat/trunk/test/org/apache/tomcat/util/buf/TestAscii.java (props changed) Propchange: tomcat/trunk/test/org/apache/tomcat/util/buf/TestAscii.java -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1578814 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/Ascii.java test/org/apache/tomcat/util/buf/TestAscii.java webapps/docs/changelog.xml
Author: markt
Date: Tue Mar 18 10:32:16 2014
New Revision: 1578814
URL: http://svn.apache.org/r1578814
Log:
Fix possible overflow when parsing long values from a byte array.
Added:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestAscii.java
(props changed)
- copied unchanged from r1578812,
tomcat/trunk/test/org/apache/tomcat/util/buf/TestAscii.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1578812-1578813
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java?rev=1578814r1=1578813r2=1578814view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/Ascii.java Tue Mar 18
10:32:16 2014
@@ -40,10 +40,11 @@ public final class Ascii {
private static final boolean[] isWhite = new boolean[256];
private static final boolean[] isDigit = new boolean[256];
+private static final long OVERFLOW_LIMIT = Long.MAX_VALUE / 10;
+
/*
* Initialize character translation and type tables.
*/
-
static {
for (int i = 0; i 256; i++) {
toUpper[i] = (byte)i;
@@ -206,19 +207,12 @@ public final class Ascii {
}
long n = c - '0';
-long m;
-
while (--len 0) {
-if (!isDigit(c = b[off++])) {
-throw new NumberFormatException();
-}
-m = n * 10 + c - '0';
-
-if (m n) {
-// Overflow
-throw new NumberFormatException();
+if (isDigit(c = b[off++])
+(n OVERFLOW_LIMIT || (n == OVERFLOW_LIMIT (c - '0')
8))) {
+n = n * 10 + c - '0';
} else {
-n = m;
+throw new NumberFormatException();
}
}
Propchange: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestAscii.java
--
svn:eol-style = native
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=1578814r1=1578813r2=1578814view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 18 10:32:16 2014
@@ -120,6 +120,10 @@
and use a bit shift instead of a multiplication as it is marginally
faster. (markt/kkolinko)
/fix
+ fix
+Fix possible overflow when parsing long values from a byte array.
+(markt)
+ /fix
/changelog
/subsection
subsection name=Jasper
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1578815 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Mar 18 10:37:49 2014 New Revision: 1578815 URL: http://svn.apache.org/r1578815 Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1578815r1=1578814r2=1578815view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Mar 18 10:37:49 2014 @@ -70,6 +70,11 @@ PATCHES PROPOSED TO BACKPORT: +1: markt -1: +* Fix possible overflow when parsing long values from a byte array. + http://people.apache.org/~markt/patches/2014-03-18-ascii-tc6.patch + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1578817 - /tomcat/trunk/webapps/docs/deployer-howto.xml
Author: violetagg
Date: Tue Mar 18 10:54:12 2014
New Revision: 1578817
URL: http://svn.apache.org/r1578817
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56268
Specify the default value of the ${build} in the build section.
Modified:
tomcat/trunk/webapps/docs/deployer-howto.xml
Modified: tomcat/trunk/webapps/docs/deployer-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/deployer-howto.xml?rev=1578817r1=1578816r2=1578817view=diff
==
--- tomcat/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/trunk/webapps/docs/deployer-howto.xml Tue Mar 18 10:54:12 2014
@@ -318,9 +318,11 @@
ul
li
codebuild/code: The build folder used will be, by default,
-code${build}/webapp/${path}/code. After the end of the
execution
-of the codecompile/code target, the web application .WAR
will be
-located at code${build}/webapp/${path}.war/code.
+code${build}/webapp/${path}/code (code${build}/code, by
+default, points to code${basedir}/build/code). After the
end
+of the execution of the codecompile/code target, the web
+application .WAR will be located at
+code${build}/webapp/${path}.war/code.
/li
li
codewebapp/code: The directory containing the exploded web
application
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1578818 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/deployer-howto.xml
Author: violetagg
Date: Tue Mar 18 10:56:59 2014
New Revision: 1578818
URL: http://svn.apache.org/r1578818
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56268
Merged revision 1578817 from tomcat/trunk:
Specify the default value of the ${build} in the build section.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1578817
Modified: tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml?rev=1578818r1=1578817r2=1578818view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/deployer-howto.xml Tue Mar 18 10:56:59
2014
@@ -317,9 +317,11 @@
ul
li
codebuild/code: The build folder used will be, by default,
-code${build}/webapp/${path}/code. After the end of the
execution
-of the codecompile/code target, the web application .WAR
will be
-located at code${build}/webapp/${path}.war/code.
+code${build}/webapp/${path}/code (code${build}/code, by
+default, points to code${basedir}/build/code). After the
end
+of the execution of the codecompile/code target, the web
+application .WAR will be located at
+code${build}/webapp/${path}.war/code.
/li
li
codewebapp/code: The directory containing the exploded web
application
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1818 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1578811 Blamelist: violetagg Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56265] Unexpected escaping in the values of dynamic tag attributes containing EL expressions
https://issues.apache.org/bugzilla/show_bug.cgi?id=56265 --- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com --- Created attachment 31400 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31400action=edit 2014-03-18_56265_tc8_v2.patch A better solution, with tests. This covers this bug and xmlescaping in attributes of bug 55198. https://issues.apache.org/bugzilla/show_bug.cgi?id=55198 XmlEscaping in bodies of bug 55198 is not covered, not investigated (nobody raised that besides me in discussion of bug 55198). Mark had compatibility concerns. https://issues.apache.org/bugzilla/show_bug.cgi?id=55198#c6 It is possible to introduce an option to make xmlescaping in attributes optional (a TODO comment in the patch). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1578846 - in /tomcat/trunk: java/org/apache/catalina/ant/AbstractCatalinaTask.java webapps/docs/changelog.xml
Author: kkolinko
Date: Tue Mar 18 12:38:48 2014
New Revision: 1578846
URL: http://svn.apache.org/r1578846
Log:
Followup to r1578260
Amend javadoc for the new option.
Move Ant task changes from Web applications to Other section of changelog.
Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1578846r1=1578845r2=1578846view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Tue Mar
18 12:38:48 2014
@@ -114,6 +114,14 @@ public abstract class AbstractCatalinaTa
/**
* If set to true - ignore the constraint of the first line of the response
* message that must be OK -.
+ * p
+ * When this attribute is set to {@code false} (the default), the first
line
+ * of server response is expected to start with OK -. If it does not
+ * then the task is considered as failed and the first line is treated
+ * as an error message.
+ * p
+ * When this attribute is set to {@code true}, the first line of the
+ * response is treated like any other, regardless of its text.
*/
protected boolean ignoreResponseConstraint = false;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1578846r1=1578845r2=1578846view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 18 12:38:48 2014
@@ -231,19 +231,6 @@
Add support for codeLAST_ACCESS_AT_START/code system property to
Manager web application. (kfujino)
/fix
- fix
- Add definition of codeorg.apache.catalina.ant.FindLeaksTask/code.
- (kfujino)
- /fix
- fix
- Implement codeorg.apache.catalina.ant.VminfoTask/code,
- codeorg.apache.catalina.ant.ThreaddumpTask/code and
- codeorg.apache.catalina.ant.SslConnectorCiphersTask/code.
(kfujino)
- /fix
- add
- Add the option to ignore the constraint of the first line of the
-response message that must be OK -. Default is false. (kfujino)
- /add
/changelog
/subsection
subsection name=Other
@@ -302,6 +289,21 @@
bug56204/bug: Remove unnecessary dependency between tasks in the
build script. (markt)
/fix
+ fix
+ Add definition of codeorg.apache.catalina.ant.FindLeaksTask/code.
+ (kfujino)
+ /fix
+ fix
+ Implement codeorg.apache.catalina.ant.VminfoTask/code,
+ codeorg.apache.catalina.ant.ThreaddumpTask/code and
+ codeorg.apache.catalina.ant.SslConnectorCiphersTask/code.
(kfujino)
+ /fix
+ add
+ Add the option to the Apache Ant tasks to ignore the constraint of the
+ first line of the response message that must be OK -
+ (codeignoreResponseConstraint/code in
codeAbstractCatalinaTask/code).
+ Default is false. (kfujino)
+ /add
/changelog
/subsection
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5613 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1578810 Blamelist: violetagg BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[Bug 56265] Unexpected escaping in the values of dynamic tag attributes containing EL expressions
https://issues.apache.org/bugzilla/show_bug.cgi?id=56265 --- Comment #6 from Mark Thomas ma...@apache.org --- Created attachment 31401 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31401action=edit Proposed patch v3 I've been looking at v2 of the patch. I think I found a couple of bugs in the testBug56265() - The method wasn't annotated with @Test so the test did not execute - bug56265.jsp assigned a value to a request attribute named 'text' but tried to use an attribute named 'world'. - The test was expected value [1] to be unescaped but I think it should have been expecting it to be escaped I've attached v3 of the patch for comment that - assuming my analysis of v2 is correct - addresses the issues I found and adds a few more tests. The fix part of the patch is now a lot simpler. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Tomcat Wiki] Update of FAQ/Linux_Unix by KonstantinKolinko
On 17/03/14 13:13, Emmanuel Bourg wrote: Le 03/03/2014 13:40, Brian Burch a écrit : If you need some help (perhaps QA testing), please let me know. Thank you for offering your help Brian. Tomcat 7.0.52 is now available for Debian Wheezy through the backports [1]. Tomcat 8 has been submitted and is awaiting to be reviewed. If it goes well it may be available in the backports in one month. Emmanuel Bourg [1] https://packages.debian.org/source/wheezy-backports/tomcat7 Hi, Emmanuel. I have downloaded your packages and will try them out during this week. I suspect the tomcat dev list is not the right place to discuss testing these packages in detail. Unless you say otherwise, I will email you directly with any observations. Regards, Brian - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5614 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1578846 Blamelist: kkolinko,markt,violetagg Build succeeded! sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56281] New: Parallel deployment with Ant deploy task
https://issues.apache.org/bugzilla/show_bug.cgi?id=56281 Bug ID: 56281 Summary: Parallel deployment with Ant deploy task Product: Tomcat 7 Version: 7.0.52 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Integration Assignee: dev@tomcat.apache.org Reporter: mgeich5+apache...@gmail.com I am trying to deploy a tomcat webapp with Ant deploy task but the version does not seem to be considered. When I deploy a file with name ROOT##003 the version is not considered and instead of deploying version 003 it tries to deploy with an unspecified version. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56265] Unexpected escaping in the values of dynamic tag attributes containing EL expressions
https://issues.apache.org/bugzilla/show_bug.cgi?id=56265
--- Comment #7 from Konstantin Kolinko knst.koli...@gmail.com ---
(In reply to Mark Thomas from comment #6)
Created attachment 31401 [details]
Proposed patch v3
I've been looking at v2 of the patch.
I think I found a couple of bugs in the testBug56265()
- The method wasn't annotated with @Test so the test did not execute
- bug56265.jsp assigned a value to a request attribute named 'text' but
tried to use an attribute named 'world'.
My bad. I have to fix it.
- The test was expected value [1] to be unescaped but I think it should have
been expecting it to be escaped
Wrong. The tag bug56265.tagx print the values as
jsp:text[${e.key}]: [${e.value}]/jsp:text
Those are the attribute values how they were provided by XML parser. They are
unescaped ones.
I've attached v3 of the patch for comment that - assuming my analysis of v2
is correct - addresses the issues I found and adds a few more tests. The fix
part of the patch is now a lot simpler.
Wrong. Escaping discussed in bug 55198 shall be applied to template content of
the document - to attributes of Node.UninterpretedTag only (and to textual
content in the bodies if we extend this).
There is no reason to apply xmlescaping in the dozen of other cases when
getAttribute(...) method is called.
There is also if (pageInfo.isELIgnored()) branch that shall be handled in the
same way as an attribute that does not contain EL expressions. My patch covers
that, though I have not wrote a test case.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56268] Minor correction to deployer-howto.html
https://issues.apache.org/bugzilla/show_bug.cgi?id=56268 Violeta Georgieva violet...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Violeta Georgieva violet...@apache.org --- Thanks for the report. This has been fixed in trunk for 8.0.4 and in 7.0.x for 7.0.53 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54700] Improvement: Add support for system property to specify location of APR/native library
https://issues.apache.org/bugzilla/show_bug.cgi?id=54700 --- Comment #1 from Christopher Schultz ch...@christopherschultz.net --- I'm curious what the user case is for manually loading the library. Under what conditions would you not know its location prior to JVM launch? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for 8.0.4
Mark, On 3/17/14, 8:19 AM, Mark Thomas wrote: It has been a while since 8.0.3 and the change log is looking rather long. I've a few things left I want to look at but I expect to be in a position to tag 8.0.4 late today / early tomorrow. Any objections to adding the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56027, now that there has been a tcnative release? I needed a tcnative release to include some support code to allow the APR listener to allow FIPS mode when OpenSSL had already been initialized in FIPS mode before the APR listener tries to enter it. (Wow, that sentence is awful. Read the bug for a long-winded explanation). Thanks, -chris signature.asc Description: OpenPGP digital signature
Re: [Tomcat Wiki] Update of FAQ/Linux_Unix by KonstantinKolinko
Emmanuel, On 3/17/14, 9:13 AM, Emmanuel Bourg wrote: Le 03/03/2014 13:40, Brian Burch a écrit : If you need some help (perhaps QA testing), please let me know. Thank you for offering your help Brian. Tomcat 7.0.52 is now available for Debian Wheezy through the backports [1]. Tomcat 8 has been submitted and is awaiting to be reviewed. If it goes well it may be available in the backports in one month. I also appreciate the work you are doing, here. The current release 8.0.3 was voted beta and does have a number of problems that make its use in production a Bad Idea. Tomcat 8 is just on the verge of being voted stable. Once the first stable release of Tomcat 8 is available, could you do a package-refresh? It would certainly help early adoption of Tomcat 8 which is quite good and has a lot of desirable features for our users. -chris signature.asc Description: OpenPGP digital signature
[Bug 54700] Improvement: Add support for system property to specify location of APR/native library
https://issues.apache.org/bugzilla/show_bug.cgi?id=54700 --- Comment #2 from Nick Williams nicho...@nicholaswilliams.net --- My specific use case: We're creating a lightweight application that runs using an embedded Tomcat instance. We want to ship one JAR that does everything for any* OS. This means embedding the .dll/.so4/.jnilib files in the JAR and, while starting up the embedded Tomcat from the main method, discovering the OS and picking the correct APR/native library file to copy to the temp directory and point Tomcat to. * Any means Windows, Max OS X, RedHat/CentOS, SuSE/OpenSUSE, Debian/Ubuntu. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: Time for 8.0.4
TCN was updated? I still see 1.1.29 (15 October 2013) on the tomcat.apache.org links (both docs and download). or am I missing something (likely). -Rob From: Christopher Schultz [ch...@christopherschultz.net] Sent: Tuesday, March 18, 2014 3:46 PM To: Tomcat Developers List Subject: Re: Time for 8.0.4 Mark, On 3/17/14, 8:19 AM, Mark Thomas wrote: It has been a while since 8.0.3 and the change log is looking rather long. I've a few things left I want to look at but I expect to be in a position to tag 8.0.4 late today / early tomorrow. Any objections to adding the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56027, now that there has been a tcnative release? I needed a tcnative release to include some support code to allow the APR listener to allow FIPS mode when OpenSSL had already been initialized in FIPS mode before the APR listener tries to enter it. (Wow, that sentence is awful. Read the bug for a long-winded explanation). Thanks, -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56281] Parallel deployment with Ant deploy task
https://issues.apache.org/bugzilla/show_bug.cgi?id=56281 Christopher Schultz ch...@christopherschultz.net changed: What|Removed |Added OS||All --- Comment #1 from Christopher Schultz ch...@christopherschultz.net --- Can you give an example of your ant script? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54700] Improvement: Add support for system property to specify location of APR/native library
https://issues.apache.org/bugzilla/show_bug.cgi?id=54700 --- Comment #3 from Christopher Schultz ch...@christopherschultz.net --- So your Java application is actually a self-deployer that puts files in certain places and then launches Tomcat in an embedded fashion? Don't you know where you are going to put your libraries, even if you don't know what OS you are on (e.g. ./libs or TMPDIR/myapp)? Are you launching from a script or expecting people to double-click directly on a .JAR file, so your first opportunity for inspecting anything is in the Java code itself? I'm not saying that this feature wouldn't be useful, but I'm not yet convinced its necessary. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for 8.0.4
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 18/03/2014 19:46, Christopher Schultz wrote: Mark, On 3/17/14, 8:19 AM, Mark Thomas wrote: It has been a while since 8.0.3 and the change log is looking rather long. I've a few things left I want to look at but I expect to be in a position to tag 8.0.4 late today / early tomorrow. Any objections to adding the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56027, now that there has been a tcnative release? There hasn't. There was a mod_jk release. Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTKKb/AAoJEBDAHFovYFnnnpQQAK6lahP7sHVBkxr1mj4f3J9o VTqWcfx/IgyNfHPiO7mjcelh8c0iq9K22RbT+xFdFrMS1Ncuk1Avy1HNm0fiZPHo PvP6XWDc/0sFlrE+KOduk2Pt32PVWtmysGYPWUOPejwwqpRGRXPFPnuIXK6/eZh4 TMxFzm4Vm2XgXBWf4OySX4AY2ZeQ+hVvdYZTQj8fBWDWbcEmGhD+c+lTGGK5bY84 G1mzZ5rvRss2/txGF/dE0LakWHrI43+dQoHcVG0//Nm23mYfiEPNJR6/R29bdhSZ wtJxVFcfdQzoB36/n0qBOfAHpgSF1ocLiyzOt/HNSnhELcG4M7gflygwvL1NsuX3 TS+L/G2O3QPd6XzRYf/I+ZuS1yPMDrgscnIDpn/4Mn6aQ1A1d9rdNDzETsrKcCk0 N+y7OeH/zI0QZ4Rq+u2rNfIDk3DD38CyRKm4AtOkKONU3q4VhuKpptxwMHjXOWVS 9S+2bz80j5LjZbMOI3ZsvdWo7aJwnsKfxIy1Hi5SE7zVn4RavWFva/Zr/0Hs67IG EELM97XVZ+bzbg116mZZ1VDQ+F0AD/unrhXM8S0A2bsgqV2L1GV0/PlCbzOvsQ8u hIVQ+6enhUFOEg4Eq9KkaigYKV87YPk9KTJO4a5POCMk5/bTHCPRnX7V7gJMBO0L F8a31bVN/lijBRG7HOoh =lEnv -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56281] Parallel deployment with Ant deploy task
https://issues.apache.org/bugzilla/show_bug.cgi?id=56281 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #2 from Mark Thomas ma...@apache.org --- The file name is ignored. You need to set the version parameter. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of tools/check_jmxproxy.pl by ChristopherSchultz
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The tools/check_jmxproxy.pl page has been changed by ChristopherSchultz:
https://wiki.apache.org/tomcat/tools/check_jmxproxy.pl?action=diffrev1=1rev2=2
Comment:
Added thanks to Susan Burgee and fixed example in help-text.
# Christopher Schultz licenses this file to You under the Apache License,
# Version 2.0 (the License); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
- #
+ #
# http://www.apache.org/licenses/LICENSE-2.0
- #
+ #
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an AS IS BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
+ # Special thanks to Susan Burgee for her help with Perl.
+ #
use strict;
@@ -30, +32 @@
use Getopt::Long qw(:config no_ignore_case bundling);;
# For HTTP stuff:
- use LWP::UserAgent;
+ use LWP::UserAgent;
- use HTTP::Request;
+ use HTTP::Request;
- use HTTP::Response;
+ use HTTP::Response;
use URI::Heuristic;
my $help = '';
@@ -121, +123 @@
the warning value in order to perform a less-than comparison.
Example:
-${0} -u
'http://host/manager/jmxproxy?get=java.lang:type=Memoryatt=HeapMemoryUsagekey=used'
-w 33554432 -c 50331648
+${0} -U
'http://host/manager/jmxproxy?get=java.lang:type=Memoryatt=HeapMemoryUsagekey=used'
-w 33554432 -c 50331648
This example will report CRITICAL if the current JVM heap size exceeds
48MiB or WARN if the heap size exceeds 32MiB.
@@ -136, +138 @@
}
my $full_url = URI::Heuristic::uf_urlstr($url);
- my $ua = LWP::UserAgent-new();
+ my $ua = LWP::UserAgent-new();
$ua-agent($useragent);
- my $req = HTTP::Request-new(GET = $url);
+ my $req = HTTP::Request-new(GET = $url);
# Set the authentication information if necessary
if (!($authorization eq '')) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54700] Improvement: Add support for system property to specify location of APR/native library
https://issues.apache.org/bugzilla/show_bug.cgi?id=54700 --- Comment #4 from Nick Williams nicho...@nicholaswilliams.net --- Again in our very specific use case, this application is launching as a WebStart. That means it must be able to run either if the browser automatically launches it OR if the user double-clicks the JAR from wherever they downloaded it to. It uses a temporary folder for any tasks that strictly require a real file system. It cleans up after itself before it completes shutdown by deleting all the files it created. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for 8.0.4
2014-03-18 23:46 GMT+04:00 Christopher Schultz ch...@christopherschultz.net:
Mark,
On 3/17/14, 8:19 AM, Mark Thomas wrote:
It has been a while since 8.0.3 and the change log is looking rather
long. I've a few things left I want to look at but I expect to be in a
position to tag 8.0.4 late today / early tomorrow.
Any objections to adding the fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=56027, now that there
has been a tcnative release?
I needed a tcnative release to include some support code to allow the
APR listener to allow FIPS mode when OpenSSL had already been
initialized in FIPS mode before the APR listener tries to enter it.
(Wow, that sentence is awful. Read the bug for a long-winded explanation).
According to tc-native changelog, the new function you are calling
there will be in 1.1.30.
The recent release was of mod_jk, not of tc-native. (BTW, no
announcement article on tomcat.a.o). Thus '-1'.
Regarding the patch:
1) Why in the on case you are calling SSL.fipsModeGet()? If you
hadn't done that, I think it would work with older library versions.
2) In documentation part: update required version of tc-native in
description of this feature.
3) Update recommended/required versions in APRLifecycleListener?
4) Code style: position of opening '{'.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56281] Parallel deployment with Ant deploy task
https://issues.apache.org/bugzilla/show_bug.cgi?id=56281
--- Comment #3 from Joqus mgeich5+apache...@gmail.com ---
The code I am using
target name=tomcat.deploy
deploy url=http://localhost:8080/manager/text;
username=${deploy.user} password=${deploy.pass} path=/
war=file:ROOT%23%23${version}.war/
/target
(the %23 are the '#' characters)
How can I specify the version in this case?
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: Time for 8.0.4
Konstantin,
Don't want to be putting words in Chris's mouth, but when I filed 56027 I did
some poking around in the underlying openSSL code (at least on my RHEL6 box).
Calling the openssl FIPS_mode_set() method twice causes an error. I'd proposed
exposing an additional routine to check the current status and quietly skip
calling FIPS_mode_set() if we were already in FIPS mode.
-Rob
From: Konstantin Kolinko [knst.koli...@gmail.com]
Sent: Tuesday, March 18, 2014 4:11 PM
To: Tomcat Developers List
Subject: Re: Time for 8.0.4
2014-03-18 23:46 GMT+04:00 Christopher Schultz ch...@christopherschultz.net:
Mark,
On 3/17/14, 8:19 AM, Mark Thomas wrote:
It has been a while since 8.0.3 and the change log is looking rather
long. I've a few things left I want to look at but I expect to be in a
position to tag 8.0.4 late today / early tomorrow.
Any objections to adding the fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=56027, now that there
has been a tcnative release?
I needed a tcnative release to include some support code to allow the
APR listener to allow FIPS mode when OpenSSL had already been
initialized in FIPS mode before the APR listener tries to enter it.
(Wow, that sentence is awful. Read the bug for a long-winded explanation).
According to tc-native changelog, the new function you are calling
there will be in 1.1.30.
The recent release was of mod_jk, not of tc-native. (BTW, no
announcement article on tomcat.a.o). Thus '-1'.
Regarding the patch:
1) Why in the on case you are calling SSL.fipsModeGet()? If you
hadn't done that, I think it would work with older library versions.
2) In documentation part: update required version of tc-native in
description of this feature.
3) Update recommended/required versions in APRLifecycleListener?
4) Code style: position of opening '{'.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56265] Unexpected escaping in the values of dynamic tag attributes containing EL expressions
https://issues.apache.org/bugzilla/show_bug.cgi?id=56265 Mark Thomas ma...@apache.org changed: What|Removed |Added Attachment #31401|0 |1 is obsolete|| --- Comment #8 from Mark Thomas ma...@apache.org --- Created attachment 31402 -- https://issues.apache.org/bugzilla/attachment.cgi?id=31402action=edit Proposed patch v4 I have updated my previous patch to follow the Validator changes in v2 but still with the test fixes from v3. I'm not 100% confident this patch is right yet. I want to spend more time reviewing it but I've put it here in case it is useful. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54700] Improvement: Add support for system property to specify location of APR/native library
https://issues.apache.org/bugzilla/show_bug.cgi?id=54700 --- Comment #5 from Chuck Caldarale chuck.caldar...@unisys.com --- (In reply to Nick Williams from comment #4) Again in our very specific use case, this application is launching as a WebStart. It would seem like this scenario argues strongly against trying to use native libraries at all, and instead stick to pure Java. Given all the platform-specific dependencies that tomcat-native has, you'd be avoiding a ton of potential issues. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Tomcat Wiki] Update of FAQ/Linux_Unix by KonstantinKolinko
Le 18/03/2014 20:49, Christopher Schultz a écrit : Tomcat 8 is just on the verge of being voted stable. Once the first stable release of Tomcat 8 is available, could you do a package-refresh? Yes definitely. Introducing a new package into Debian takes some time, but pushing an update is much easier. Updates can be prepared by anyone willing to do the work, it's often just a matter or refreshing some patches. If someone here is interested in pushing updates I can walk him through the process. Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56281] Parallel deployment with Ant deploy task
https://issues.apache.org/bugzilla/show_bug.cgi?id=56281 Joqus mgeich5+apache...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID |--- -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56281] Parallel deployment with Ant deploy task
https://issues.apache.org/bugzilla/show_bug.cgi?id=56281 Chuck Caldarale chuck.caldar...@unisys.com changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |INVALID --- Comment #4 from Chuck Caldarale chuck.caldar...@unisys.com --- Bugzilla is not a support forum. You should be using the Tomcat users mailing list. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56281] Parallel deployment with Ant deploy task
https://issues.apache.org/bugzilla/show_bug.cgi?id=56281 --- Comment #5 from Joqus mgeich5+apache...@gmail.com --- This is the problem with this kind of community, the channel is more important than the actual goal. Solving the issue is just a detail, you HAVE to go somewhere else. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56213] Many KeyReference Objects Cause Long CMS-remark GC Times
https://issues.apache.org/bugzilla/show_bug.cgi?id=56213 --- Comment #3 from Jeff Middleton jmid...@gmail.com --- Thanks for the quick turnaround! I see what you are saying about the reference objects, but yes this change made a huge difference in gc times. The times quoted in the description (100ms vs 8.8 secs) were with and without that patch. Maybe it is the finalization method that is slowing things down. Just did some quick reading and it appears to be executed during that phase. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56281] Parallel deployment with Ant deploy task
https://issues.apache.org/bugzilla/show_bug.cgi?id=56281 --- Comment #6 from Chuck Caldarale chuck.caldar...@unisys.com --- (In reply to Joqus from comment #5) This is the problem with this kind of community, the channel is more important than the actual goal. Solving the issue is just a detail, you HAVE to go somewhere else. No, the point is to insure that the issue and responses are visible (and therefore might help) all those on the users mailing list, not just the one person who improperly filed a bugzilla entry. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56281] Parallel deployment with Ant deploy task
https://issues.apache.org/bugzilla/show_bug.cgi?id=56281 --- Comment #7 from Joqus mgeich5+apache...@gmail.com --- Ok, thanks for nothing. (In reply to Chuck Caldarale from comment #6) (In reply to Joqus from comment #5) This is the problem with this kind of community, the channel is more important than the actual goal. Solving the issue is just a detail, you HAVE to go somewhere else. No, the point is to insure that the issue and responses are visible (and therefore might help) all those on the users mailing list, not just the one person who improperly filed a bugzilla entry. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 14 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 27 mins 49 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140319-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140319.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140319-native-src.tar.gz -Dexecute.test.nio=false -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/apache-co mmons/pool -Dcommons-dbcp.home=/srv/gump/public/workspace/apache-commons/dbcp -Dexecute.test.nio2=true -Dexecute.test.bio=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140319.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servle
