[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 7 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 9.x, a web server implementing the Java Servlet 4.0, ... 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. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/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 55 secs Command Line: /usr/lib/jvm/java-8-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.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.5-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161017-native-src.tar.gz -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20161017.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161017-native-src .tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20161017/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.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-8-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/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/pub
[GUMP@vmgump]: Project tomcat-trunk-test-apr (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-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 7 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-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/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. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 26 mins 32 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dtest.temp=output/test-tmp-APR -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dtest.accesslog=true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.5-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20161017.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20161017/bin/openssl -Dexecute.test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dexecute.test.apr=true -Dexecute.test.nio2=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161017-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomc at-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161017-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20161017/lib -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.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-8-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/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/pub
svn commit: r1765291 - /tomcat/trunk/test/org/apache/tomcat/util/http/parser/TesterParserPerformance.java
Author: markt
Date: Mon Oct 17 14:12:41 2016
New Revision: 1765291
URL: http://svn.apache.org/viewvc?rev=1765291&view=rev
Log:
Add a performance test that confirms boolean arrays are preferable to BitSets
in terms of performance
Added:
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TesterParserPerformance.java
(with props)
Added:
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TesterParserPerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/parser/TesterParserPerformance.java?rev=1765291&view=auto
==
---
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TesterParserPerformance.java
(added)
+++
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TesterParserPerformance.java
Mon Oct 17 14:12:41 2016
@@ -0,0 +1,79 @@
+/*
+ * 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.http.parser;
+
+import java.util.BitSet;
+
+import org.junit.Test;
+
+public class TesterParserPerformance {
+
+@Test
+public void testBitSetVsBooleanArray() {
+Lookup bitsetLookup = new BitSetLookup();
+Lookup booleanArrayLookup = new BooleanArrayLookup();
+
+int count = 1;
+int loops = 5;
+
+// Warm up
+doLookupTest(bitsetLookup, count);
+doLookupTest(booleanArrayLookup, count);
+
+for (int i = 0; i < loops; i++) {
+System.out.println("Bitset : " + doLookupTest(bitsetLookup,
count) + "ns");
+System.out.println("Boolean[]: " +
doLookupTest(booleanArrayLookup, count) + "ns");
+}
+}
+
+
+private long doLookupTest(Lookup lookup, int iterations) {
+long start = System.nanoTime();
+for (int i = 0; i < iterations; i++) {
+for (int j = 0; j < 128; j++) {
+lookup.doLookup(j);
+}
+}
+return System.nanoTime() - start;
+}
+
+private interface Lookup {
+boolean doLookup(int i);
+}
+
+
+private static class BitSetLookup implements Lookup {
+
+private BitSet values = new BitSet(128);
+
+@Override
+public boolean doLookup(int i) {
+return values.get(i);
+}
+}
+
+
+private static class BooleanArrayLookup implements Lookup {
+
+private boolean[] values = new boolean[128];
+
+@Override
+public boolean doLookup(int i) {
+return values[i];
+}
+}
+}
Propchange:
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TesterParserPerformance.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: r1765296 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: violetagg Date: Mon Oct 17 14:31:23 2016 New Revision: 1765296 URL: http://svn.apache.org/viewvc?rev=1765296&view=rev Log: Updates (excluding docs) for 6.0.47 release Modified: tomcat/site/trunk/build.properties.default tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-6.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-60.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-6.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1765296&r1=1765295&r2=1765296&view=diff == --- tomcat/site/trunk/build.properties.default (original) +++ tomcat/site/trunk/build.properties.default Mon Oct 17 14:31:23 2016 @@ -36,7 +36,7 @@ tomcat.loc=http://www.apache.org/dist/to # - Tomcat versions - -tomcat60=6.0.45 +tomcat60=6.0.47 tomcat70=7.0.72 tomcat80=8.0.38 tomcat85=8.5.6 Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1765296&r1=1765295&r2=1765296&view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Mon Oct 17 14:31:23 2016 @@ -74,8 +74,8 @@ Latest Stable 6.0.x Release -2016-02-11 -6.0.45 +2016-10-16 +6.0.47 Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1765296&r1=1765295&r2=1765296&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Mon Oct 17 14:31:23 2016 @@ -225,7 +225,7 @@ Quick Navigation -[define v]6.0.45[end] +[define v]6.0.47[end] https://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS | [v] | Browse | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1765296&r1=1765295&r2=1765296&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Mon Oct 17 14:31:23 2016 @@ -245,6 +245,38 @@ project logo are trademarks of the Apach + +2016-10-16 Tomcat 6.0.47 Released + + + +The Apache Tomcat Project is proud to announce the release of version 6.0.47 of +Apache Tomcat. This release includes a number of bug fixes over +Apache Tomcat 6.0.45. The notable changes include: + + + +Update the packaged version of the Tomcat Native Library to 1.2.10 to pick +up the latest Windows binaries built with OpenSSL 1.0.2j. + + + + + +Note: End of life date for Apache Tomcat 6.0.x is announced. +Read more... + + + + + + +Download | +ChangeLog for 6.0.47 + + + + 2016-10-10 Tomcat 8.5.6 Released @@ -435,37 +467,6 @@ Full details of these changes, and all t - - -2016-02-11 Tomcat 6.0.45 Released - - - -The Apache Tomcat Project is proud to announce the release of version 6.0.45 of -Apache Tomcat. This release includes a number of security and bug fixes over -Apache Tomcat 6.0.44. The notable changes include: - - - -Update to Tomcat Native Library version 1.1.34. - - - - - -Note: End of life date for Apache Tomcat 6.0.x is announced. -Read more... - - - - - - -Download | -ChangeLog for 6.0.45 - - - 2015-12-15 Tomcat Native 1.1.34 Released Modified: tomcat/site/trunk/docs/migration-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-6.html?rev=1765296&r1=1765295&r2=1765296&view=diff == --- tomcat/site/trunk/docs/migration-6.html (original) +++ tomcat/site/trunk/docs/migration-6.html Mon Oct 17 14:31:23 2016 @@ -556,7 +556,10 @@ of Apache Tomcat. "6.0.37":"1476938", "6.0.39":"1561893", "6.0.41":"1595825", - "6.0.43":"1639591" + "6.0.43":"1639591", + "6.0.44":"1678328", + "6.0.45":"1727983", + "6.0.47":"1764645" }; formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/"; + @@ -612,8 +615,11 @@ of Apache Tomcat. 6.0.36 6.0.37 6.0.39 -6.0.41 +6.0.41 6.0.43 +6.0.44 +6.0.45 +6.0.47 , new version: 6.0.0 @@ -642,7 +648,10 @@ of Apache Tomcat. 6.0.37 6.0.39 6.0.41 -6.0.43 +6.0.43 +6.0.44
svn commit: r1765299 - in /tomcat/trunk: java/org/apache/tomcat/util/http/parser/HttpParser.java test/org/apache/tomcat/util/http/parser/TestHttpParser.java webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 17 14:45:57 2016
New Revision: 1765299
URL: http://svn.apache.org/viewvc?rev=1765299&view=rev
Log:
DEL is not valid in a token.
Refactor with a view to re-using this code more widely in the Tomcat codebase.
Added:
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
(with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1765299&r1=1765298&r2=1765299&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Mon
Oct 17 14:45:57 2016
@@ -34,33 +34,41 @@ import java.io.StringReader;
*/
public class HttpParser {
-// Arrays used by isToken(), isHex()
-private static final boolean isToken[] = new boolean[128];
-private static final boolean isHex[] = new boolean[128];
+private static final int ARRAY_SIZE = 128;
+
+private static final boolean[] IS_CONTROL = new boolean[ARRAY_SIZE];
+private static final boolean[] IS_SEPARATOR = new boolean[ARRAY_SIZE];
+private static final boolean[] IS_TOKEN = new boolean[ARRAY_SIZE];
+private static final boolean[] IS_HEX = new boolean[ARRAY_SIZE];
static {
-// Setup the flag arrays
-for (int i = 0; i < 128; i++) {
-if (i <= 32) { // includes '\t' and ' '
-isToken[i] = false;
-} else if (i == '(' || i == ')' || i == '<' || i == '>' || i ==
'@' ||
- i == ',' || i == ';' || i == ':' || i == '\\' || i ==
'\"' ||
- i == '/' || i == '[' || i == ']' || i == '?' || i ==
'=' ||
- i == '{' || i == '}') {
-isToken[i] = false;
-} else {
-isToken[i] = true;
+for (int i = 0; i < ARRAY_SIZE; i++) {
+// Control> 0-31, 127
+if (i < 32 || i == 127) {
+IS_CONTROL[i] = true;
}
-if (i >= '0' && i <= '9' || i >= 'A' && i <= 'F' ||
-i >= 'a' && i <= 'f') {
-isHex[i] = true;
-} else {
-isHex[i] = false;
+// Separator
+if (i == '(' || i == ')' || i == '<' || i == '>' || i == '@'
||
+i == ',' || i == ';' || i == ':' || i == '\\' || i == '\"'
||
+i == '/' || i == '[' || i == ']' || i == '?' || i == '='
||
+i == '{' || i == '}' || i == ' ' || i == '\t') {
+IS_SEPARATOR[i] = true;
+}
+
+// Token: Anything 0-127 that is not a control and not a separator
+if (!IS_CONTROL[i] && !IS_SEPARATOR[i] && i < 128) {
+IS_TOKEN[i] = true;
+}
+
+// Hex: 0-9, a-f, A-F
+if ((i >= '0' && i <='9') || (i >= 'a' && i <= 'f') || (i >= 'A'
&& i <= 'F')) {
+IS_HEX[i] = true;
}
}
}
+
public static String unquote(String input) {
if (input == null || input.length() < 2) {
return input;
@@ -91,19 +99,19 @@ public class HttpParser {
return result.toString();
}
-static boolean isToken(int c) {
+public static boolean isToken(int c) {
// Fast for correct values, slower for incorrect ones
try {
-return isToken[c];
+return IS_TOKEN[c];
} catch (ArrayIndexOutOfBoundsException ex) {
return false;
}
}
-static boolean isHex(int c) {
+public static boolean isHex(int c) {
// Fast for correct values, slower for incorrect ones
try {
-return isHex[c];
+return IS_HEX[c];
} catch (ArrayIndexOutOfBoundsException ex) {
return false;
}
Added: tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParser.java?rev=1765299&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
(added)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
Mon Oct 17 14:45:57 2016
@@ -0,0 +1,28 @@
+/*
+ * 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 ma
svn commit: r16562 - /release/tomcat/tomcat-6/v6.0.45/
Author: violetagg Date: Mon Oct 17 15:13:46 2016 New Revision: 16562 Log: Remove 6.0.45 Removed: release/tomcat/tomcat-6/v6.0.45/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1765299 - in /tomcat/trunk: java/org/apache/tomcat/util/http/parser/HttpParser.java test/org/apache/tomcat/util/http/parser/TestHttpParser.java webapps/docs/changelog.xml
Envoyé de mon smartphone BlackBerry 10.
Message d'origine
De: ma...@apache.org
Envoyé: lundi 17 octobre 2016 14:46
À: dev@tomcat.apache.org
Répondre à: Tomcat Developers List
Objet: svn commit: r1765299 - in /tomcat/trunk:
java/org/apache/tomcat/util/http/parser/HttpParser.java
test/org/apache/tomcat/util/http/parser/TestHttpParser.java
webapps/docs/changelog.xml
Author: markt
Date: Mon Oct 17 14:45:57 2016
New Revision: 1765299
URL: http://svn.apache.org/viewvc?rev=1765299&view=rev
Log:
DEL is not valid in a token.
Refactor with a view to re-using this code more widely in the Tomcat codebase.
Added:
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParser.java (with
props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1765299&r1=1765298&r2=1765299&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Mon
Oct 17 14:45:57 2016
@@ -34,33 +34,41 @@ import java.io.StringReader;
*/
public class HttpParser {
- // Arrays used by isToken(), isHex()
- private static final boolean isToken[] = new boolean[128];
- private static final boolean isHex[] = new boolean[128];
+ private static final int ARRAY_SIZE = 128;
+
+ private static final boolean[] IS_CONTROL = new boolean[ARRAY_SIZE];
+ private static final boolean[] IS_SEPARATOR = new boolean[ARRAY_SIZE];
+ private static final boolean[] IS_TOKEN = new boolean[ARRAY_SIZE];
+ private static final boolean[] IS_HEX = new boolean[ARRAY_SIZE];
static {
- // Setup the flag arrays
- for (int i = 0; i < 128; i++) {
- if (i <= 32) { // includes '\t' and ' '
- isToken[i] = false;
- } else if (i == '(' || i == ')' || i == '<' || i == '>' || i == '@' ||
- i == ',' || i == ';' || i == ':' || i == '\\' || i == '\"' ||
- i == '/' || i == '[' || i == ']' || i == '?' || i == '=' ||
- i == '{' || i == '}') {
- isToken[i] = false;
- } else {
- isToken[i] = true;
+ for (int i = 0; i < ARRAY_SIZE; i++) {
+ // Control> 0-31, 127
+ if (i < 32 || i == 127) {
+ IS_CONTROL[i] = true;
}
- if (i >= '0' && i <= '9' || i >= 'A' && i <= 'F' ||
- i >= 'a' && i <= 'f') {
- isHex[i] = true;
- } else {
- isHex[i] = false;
+ // Separator
+ if ( i == '(' || i == ')' || i == '<' || i == '>' || i == '@' ||
+ i == ',' || i == ';' || i == ':' || i == '\\' || i == '\"' ||
+ i == '/' || i == '[' || i == ']' || i == '?' || i == '=' ||
+ i == '{' || i == '}' || i == ' ' || i == '\t') {
+ IS_SEPARATOR[i] = true;
+ }
+
+ // Token: Anything 0-127 that is not a control and not a separator
+ if (!IS_CONTROL[i] && !IS_SEPARATOR[i] && i < 128) {
+ IS_TOKEN[i] = true;
+ }
+
+ // Hex: 0-9, a-f, A-F
+ if ((i >= '0' && i <='9') || (i >= 'a' && i <= 'f') || (i >= 'A' && i <=
'F')) {
+ IS_HEX[i] = true;
}
}
}
+
public static String unquote(String input) {
if (input == null || input.length() < 2) {
return input;
@@ -91,19 +99,19 @@ public class HttpParser {
return result.toString();
}
- static boolean isToken(int c) {
+ public static boolean isToken(int c) {
// Fast for correct values, slower for incorrect ones
try {
- return isToken[c];
+ return IS_TOKEN[c];
} catch (ArrayIndexOutOfBoundsException ex) {
return false;
}
}
- static boolean isHex(int c) {
+ public static boolean isHex(int c) {
// Fast for correct values, slower for incorrect ones
try {
- return isHex[c];
+ return IS_HEX[c];
} catch (ArrayIndexOutOfBoundsException ex) {
return false;
}
Added: tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParser.java?rev=1765299&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
(added)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParser.java
Mon Oct 17 14:45:57 2016
@@ -0,0 +1,28 @@
+/*
+ * 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
svn commit: r1765321 [17/39] - in /tomcat/site/trunk/docs/tomcat-6.0-doc: ./ api/ api/org/apache/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/
Modified:
tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/AbstractProtocol.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/AbstractProtocol.html?rev=1765321&r1=1765320&r2=1765321&view=diff
==
---
tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/AbstractProtocol.html
(original)
+++
tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/AbstractProtocol.html
Mon Oct 17 16:02:51 2016
@@ -4,7 +4,7 @@
-AbstractProtocol (Apache Tomcat 6.0.45 API Documentation)
+AbstractProtocol (Apache Tomcat 6.0.47 API Documentation)
@@ -14,7 +14,7 @@ AbstractProtocol (Apache Tomcat 6.0.45 A
function windowTitle()
{
-parent.document.title="AbstractProtocol (Apache Tomcat 6.0.45 API
Documentation)";
+parent.document.title="AbstractProtocol (Apache Tomcat 6.0.47 API
Documentation)";
}
@@ -45,7 +45,7 @@ function windowTitle()
-Apache Tomcat 6.0.45
+Apache Tomcat 6.0.47
@@ -160,6 +160,14 @@ java.lang.Object
int
+getMaxCookieCount()
+
+
+
+
+
+
+ int
getMaxHeaderCount()
@@ -184,6 +192,14 @@ java.lang.Object
void
+setMaxCookieCount(int maxCookieCount)
+
+
+
+
+
+
+ void
setMaxHeaderCount(int maxHeaderCount)
@@ -322,6 +338,34 @@ public static int nextNameIndex()
+
+getMaxCookieCount
+
+public int getMaxCookieCount()
+
+
+
+
+
+
+
+
+
+
+
+setMaxCookieCount
+
+public void setMaxCookieCount(int maxCookieCount)
+
+
+
+
+
+
+
+
+
+
createName
@@ -362,7 +406,7 @@ protected java.lang.String createName
-Apache Tomcat 6.0.45
+Apache Tomcat 6.0.47
Modified:
tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/ActionCode.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/ActionCode.html?rev=1765321&r1=1765320&r2=1765321&view=diff
==
--- tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/ActionCode.html
(original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/ActionCode.html
Mon Oct 17 16:02:51 2016
@@ -4,7 +4,7 @@
-ActionCode (Apache Tomcat 6.0.45 API Documentation)
+ActionCode (Apache Tomcat 6.0.47 API Documentation)
@@ -14,7 +14,7 @@ ActionCode (Apache Tomcat 6.0.45 API Doc
function windowTitle()
{
-parent.document.title="ActionCode (Apache Tomcat 6.0.45 API
Documentation)";
+parent.document.title="ActionCode (Apache Tomcat 6.0.47 API
Documentation)";
}
@@ -45,7 +45,7 @@ function windowTitle()
-Apache Tomcat 6.0.45
+Apache Tomcat 6.0.47
@@ -699,7 +699,7 @@ public int getCode()
-Apache Tomcat 6.0.45
+Apache Tomcat 6.0.47
Modified:
tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/ActionHook.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/ActionHook.html?rev=1765321&r1=1765320&r2=1765321&view=diff
==
--- tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/ActionHook.html
(original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/ActionHook.html
Mon Oct 17 16:02:51 2016
@@ -4,7 +4,7 @@
-ActionHook (Apache Tomcat 6.0.45 API Documentation)
+ActionHook (Apache Tomcat 6.0.47 API Documentation)
@@ -14,7 +14,7 @@ ActionHook (Apache Tomcat 6.0.45 API Doc
function windowTitle()
{
-parent.document.title="ActionHook (Apache Tomcat 6.0.45 API
Documentation)";
+parent.document.title="ActionHook (Apache Tomcat 6.0.47 API
Documentation)";
}
@@ -45,7 +45,7 @@ function windowTitle()
-Apache Tomcat 6.0.45
+Apache Tomcat 6.0.47
@@ -185,7 +185,7 @@ void action(
-Apache Tomcat 6.0.45
+Apache Tomcat 6.0.47
Modified:
tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/Adapter.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/Adapter.html?rev=1765321&r1=1765320&r2=1765321&view=diff
==
--- tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/Adapter.html
(original)
+++ tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/coyote/Adapter.html
Mon Oct 17 16:02:51 2016
@@ -4,7 +4,7 @@
-Adapter (Apache Tomcat 6.0.45 API Documentation)
+Adapter (Apache Tomcat 6.0.47 API Documentation)
@@ -14,7 +14,7 @@ Adapter (Apache Tomcat 6.0.45 API Docume
function windowTitle()
{
-parent.document.title="Adapter (Apache Tomcat 6.0.45 API Documentation)";
+parent.document.title="Adapter (Apache Tomcat 6.0.47 API Documentation)";
}
@@ -45,7 +45,7 @@ function windowTitle()
-Apache Tomcat 6.0.45
+Apache Tomcat 6.0.47
@@ -237,7 +237,7 @@ void log(
-Apache Tomcat 6.0.45
+Apache Tomcat 6.0.47
Modified:
tomcat/site/
svn commit: r1765321 [3/39] - in /tomcat/site/trunk/docs/tomcat-6.0-doc: ./ api/ api/org/apache/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/c
Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/api/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/index.html?rev=1765321&r1=1765320&r2=1765321&view=diff == --- tomcat/site/trunk/docs/tomcat-6.0-doc/api/index.html (original) +++ tomcat/site/trunk/docs/tomcat-6.0-doc/api/index.html Mon Oct 17 16:02:51 2016 @@ -4,7 +4,7 @@ -Apache Tomcat 6.0.45 API Documentation +Apache Tomcat 6.0.47 API Documentation targetPage = "" + window.location.search; Modified: tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/AnnotationProcessor.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/AnnotationProcessor.html?rev=1765321&r1=1765320&r2=1765321&view=diff == --- tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/AnnotationProcessor.html (original) +++ tomcat/site/trunk/docs/tomcat-6.0-doc/api/org/apache/AnnotationProcessor.html Mon Oct 17 16:02:51 2016 @@ -4,7 +4,7 @@-AnnotationProcessor (Apache Tomcat 6.0.45 API Documentation) +AnnotationProcessor (Apache Tomcat 6.0.47 API Documentation) @@ -14,7 +14,7 @@ AnnotationProcessor (Apache Tomcat 6.0.4