Re: [VOTE] Release Apache Tomcat 9.0.3
Hi, The proposed 9.0.3 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 9.0.3 [ ] Beta - go ahead and release as 9.0.3 [ X ] Stable - go ahead and release as 9.0.3 Unit test passed, except for one UT failure when running on Java 9 [1], which I am planning to investigate in the next few days. Examples ok. Our test web application works fine.
Re: buildbot failure in on tomcat-trunk
On 15/01/18 22:46, build...@apache.org wrote: > The Buildbot has detected a new failure on builder tomcat-trunk while > building . Full details are available at: > https://ci.apache.org/builders/tomcat-trunk/builds/2966 > > Buildbot URL: https://ci.apache.org/ > > Buildslave for this Build: silvanus_ubuntu > > Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' > triggered this build > Build Source Stamp: [branch tomcat/trunk] 1821202 > Blamelist: markt > > BUILD FAILED: failed compile_1 Hmm. Looks like my AbstractChunk changes have broken things. Investigating now. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61999] Setting maxSavePostSize=0 won't disable saving POST data
https://bz.apache.org/bugzilla/show_bug.cgi?id=61999 --- Comment #6 from Michael --- (In reply to Remy Maucherat from comment #5) > A fix will be in 9.0.4, 8.5.25, 8.0.49 and 7.0.84. Great, thank you! With this fix our request won't fail anymore for maxSavePostSize=0. And for maxSavePostSize > 0 it still fails if the POST data is larger than maxSavePostSize, as expected. We are looking forward to integrate 8.5.25 as soon as it's released. Just for clarity, why my understanding was that only strictly < 0 means no limit was this line of code (and the tests we made): https://github.com/apache/tomcat85/blob/41b5beb92da6ad56aec509a40cb7bdcc4fa504d4/java/org/apache/tomcat/util/buf/ByteChunk.java#L323 -- 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: Release schedule for tomcat 7
On 16/01/18 05:05, Silambarasan Madhappan wrote: > Hi , > > Thanks for the quick response. > > Can you please clarify below, > > 1. If voting happens this week, by when we can expect the release ? Voting typically takes 72 hours. Release announcement normally follows ~24 hours after the vote closes (to allow time for the release to reach all the mirrors). > 2. Are there any Security CVE's will be fixed in Tomcat 7.0.83 (not > released) / 7.0.84 ? You won't get an answer to this question. The Tomcat security team follows this process: http://www.apache.org/security/committers.html CVEs, if any, are normally announced shortly after all releases in which they have been fixed have been released. Mark > > Thanks and Regards, > Silambarasan M > > On Mon, Jan 15, 2018 at 2:24 PM, Silambarasan Madhappan < > silambarasan0...@gmail.com> wrote: > >> Hi Team, >> >> What will be the release schedule for Tomcat 7.0.84 ? >> >> Are there any CVE's be fixed in Tomcat 7.0.83(not released) / 7.0.84 >> versions ? >> >> Thanks, >> Silambarasan M >> > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1821225 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: ByteChunk.java CharChunk.java
Author: markt Date: Tue Jan 16 10:14:05 2018 New Revision: 1821225 URL: http://svn.apache.org/viewvc?rev=1821225&view=rev Log: Revert 1821202 and add comment regarding compaction Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1821225&r1=1821224&r2=1821225&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan 16 10:14:05 2018 @@ -551,6 +551,7 @@ public final class ByteChunk extends Abs } tmp = new byte[newSize]; +// Compacts buffer System.arraycopy(buff, start, tmp, 0, end - start); buff = tmp; tmp = null; Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1821225&r1=1821224&r2=1821225&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jan 16 10:14:05 2018 @@ -410,11 +410,10 @@ public final class CharChunk extends Abs } tmp = new char[newSize]; -System.arraycopy(buff, start, tmp, 0, end - start); +// Some calling code assumes buffer will not be compacted +System.arraycopy(buff, 0, tmp, 0, end); buff = tmp; tmp = null; -end = end - start; -start = 0; } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio (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-nio has an issue affecting its community integration. This issue affects 1 projects. 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-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 48 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.7-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dexecute.test.nio2=false -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/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180116/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerforman ce=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-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/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util-scan.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-websocket.jar:/srv/g
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/2968 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1821225 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: 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. 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-vm3.apache.org/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: -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-vm3.apache.org/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: 22 mins 58 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.7-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true -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/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180116/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerform ance=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-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/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util-scan.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-web
[GUMP@vmgump-vm3]: 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. 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-vm3.apache.org/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: -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-vm3.apache.org/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 8 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.7-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dexecute.test.nio2=false -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.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20180116/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl- master/dest-20180116/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-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/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util-scan.
svn commit: r1821234 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: ByteChunk.java CharChunk.java
Author: markt
Date: Tue Jan 16 12:10:41 2018
New Revision: 1821234
URL: http://svn.apache.org/viewvc?rev=1821234&view=rev
Log:
Clean up - No functional change
Align comments and variable names, re-order methods, etc. to minimise diff
between ByteChunk and CharChunk
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1821234&r1=1821233&r2=1821234&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan 16
12:10:41 2018
@@ -70,9 +70,9 @@ public final class ByteChunk extends Abs
private static final long serialVersionUID = 1L;
/**
- * Input interface, used when the buffer is empty
+ * Input interface, used when the buffer is empty.
*
- * Same as java.nio.channel.ReadableByteChannel
+ * Same as java.nio.channels.ReadableByteChannel
*/
public static interface ByteInputChannel {
@@ -81,12 +81,15 @@ public final class ByteChunk extends Abs
*
* @return The number of bytes read
*
- * @throws IOException If an I/O occurs while reading the bytes
+ * @throws IOException If an I/O error occurs during reading
*/
public int realReadBytes() throws IOException;
}
/**
+ * When we need more space we'll either grow the buffer ( up to the limit )
+ * or send it to a channel.
+ *
* Same as java.nio.channel.WritableByteChannel.
*/
public static interface ByteOutputChannel {
@@ -95,12 +98,12 @@ public final class ByteChunk extends Abs
* Send the bytes ( usually the internal conversion buffer ). Expect 8k
* output if the buffer is full.
*
- * @param cbuf bytes that will be written
+ * @param buf bytes that will be written
* @param off offset in the bytes array
* @param len length that will be written
* @throws IOException If an I/O occurs while writing the bytes
*/
-public void realWriteBytes(byte cbuf[], int off, int len) throws
IOException;
+public void realWriteBytes(byte buf[], int off, int len) throws
IOException;
/**
@@ -122,12 +125,13 @@ public final class ByteChunk extends Abs
*/
public static final Charset DEFAULT_CHARSET = StandardCharsets.ISO_8859_1;
+private transient Charset charset;
+
// byte[]
private byte[] buff;
-private transient Charset charset;
-
-// How much can it grow, when data is added
+// -1: grow indefinitely
+// maximum amount to be cached
private int limit = -1;
// transient as serialization is primarily for values via, e.g. JMX
@@ -139,7 +143,6 @@ public final class ByteChunk extends Abs
* Creates a new, uninitialized ByteChunk object.
*/
public ByteChunk() {
-// NO-OP
}
@@ -188,7 +191,7 @@ public final class ByteChunk extends Abs
/**
- * Sets the message bytes to the specified subarray of bytes.
+ * Sets the buffer to the specified subarray of bytes.
*
* @param b the ascii bytes
* @param off the start offset of the bytes
@@ -217,7 +220,7 @@ public final class ByteChunk extends Abs
/**
- * @return the message bytes.
+ * @return the buffer.
*/
public byte[] getBytes() {
return getBuffer();
@@ -225,7 +228,7 @@ public final class ByteChunk extends Abs
/**
- * @return the message bytes.
+ * @return the buffer.
*/
public byte[] getBuffer() {
return buff;
@@ -605,20 +608,21 @@ public final class ByteChunk extends Abs
* Compares the message bytes to the specified String object.
*
* @param s the String to compare
- * @return true if the comparison succeeded, false otherwise
+ * @return true if the comparison succeeded,
false
+ * otherwise
*/
public boolean equals(String s) {
// XXX ENCODING - this only works if encoding is UTF8-compat
// ( ok for tomcat, where we compare ascii - header names, etc )!!!
byte[] b = buff;
-int blen = end - start;
-if (b == null || blen != s.length()) {
+int len = end - start;
+if (b == null || len != s.length()) {
return false;
}
-int boff = start;
-for (int i = 0; i < blen; i++) {
-if (b[boff++] != s.charAt(i)) {
+int off = start;
+for (int i = 0; i < len; i++) {
+if (b[off++] != s.charAt(i)) {
return false;
}
}
@@ -704,10 +708,11 @@ public final class ByteChunk e
svn commit: r1821235 - in /tomcat/trunk: java/org/apache/tomcat/util/buf/CharChunk.java test/org/apache/tomcat/util/buf/TestCharChunk.java
Author: markt
Date: Tue Jan 16 12:18:30 2018
New Revision: 1821235
URL: http://svn.apache.org/viewvc?rev=1821235&view=rev
Log:
Fix bug searching for single character Strings (search would always fail)
Bug found during comparison of indexOf() implementations between ByteChunk and
CharChunk
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1821235&r1=1821234&r2=1821235&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jan 16
12:18:30 2018
@@ -615,7 +615,11 @@ public final class CharChunk extends Abs
if (buff[i] != first) {
continue;
}
-// found first char, now look for a match
+// Special case - search string is a single character
+if (srcLen == 1) {
+return i - start;
+}
+// Found first char, now look for a match
int myPos = i + 1;
for (int srcPos = srcOff + 1; srcPos < srcEnd;) {
if (buff[myPos++] != src.charAt(srcPos++)) {
Modified: tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java?rev=1821235&r1=1821234&r2=1821235&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java Tue Jan 16
12:18:30 2018
@@ -36,4 +36,30 @@ public class TestCharChunk {
Assert.assertFalse(cc.endsWith("x"));
Assert.assertFalse(cc.endsWith("xxtest"));
}
+
+@Test
+public void testIndexOf_String() {
+char[] chars = "Hello\u00a0world".toCharArray();
+final int len = chars.length;
+
+CharChunk cc = new CharChunk();
+cc.setChars(chars, 0, len);
+
+Assert.assertEquals(0, cc.indexOf("Hello", 0, "Hello".length(), 0));
+Assert.assertEquals(2, cc.indexOf("ll", 0, 2, 0));
+Assert.assertEquals(2, cc.indexOf("Hello", 2, 2, 0));
+
+Assert.assertEquals(7, cc.indexOf("o", 0, 1, 5));
+
+// Does work outside of 0-127 (unlike ByteChunk)
+Assert.assertEquals(5, cc.indexOf("\u00a0", 0, 1, 0));
+
+cc.setChars(chars, 6, 5);
+Assert.assertEquals(1, cc.indexOf("o", 0, 1, 0));
+
+cc.setChars(chars, 6, 2);
+Assert.assertEquals(0, cc.indexOf("wo", 0, 1, 0));
+Assert.assertEquals(-1, cc.indexOf("d", 0, 1, 0));
+}
+
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: 8.5.25 release build
On 15/01/2018 19:38, Mark Thomas wrote: > On 15/01/18 17:39, Mark Thomas wrote: >> Hi all, >> >> The Javadoc failure in the first release build has triggered further >> issues. The code signing service had already signed 8.5.25 and it won't >> sign another file with the same version. >> >> I've tried various ways to work around this without success. >> >> Therefore I intend to do the following: >> - reinstate the original 8.0.25 tag from r1821166 >> - mark 8.5.25 as not released >> - update the version to 8.5.26 >> - re-tag >> - generate the release > > Groan. > > Looks like something has temporarily disabled the code signing service. > Probably something I have done given the timing but I can't figure out > what it might be. > > I have a support call in to Symantec. It it doesn't get resolved fairly > quickly, I'll release 8.5.26 without signing. Yah! Our friendly Symantec (well, Digicert now) contact has got the issue fixed. I'll have the 8.5.26 RC out later today. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1821251 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: AbstractChunk.java ByteChunk.java CharChunk.java
Author: markt
Date: Tue Jan 16 14:39:28 2018
New Revision: 1821251
URL: http://svn.apache.org/viewvc?rev=1821251&view=rev
Log:
Align indexOf(String, int, int, int) implementations and pull up.
Use ByteChunnks implementation as it is shorter.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java?rev=1821251&r1=1821250&r2=1821251&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java Tue Jan 16
14:39:28 2018
@@ -84,6 +84,29 @@ public abstract class AbstractChunk impl
}
+public int indexOf(String src, int srcOff, int srcLen, int myOff) {
+char first = src.charAt(srcOff);
+
+// Look for first char
+int srcEnd = srcOff + srcLen;
+
+mainLoop: for (int i = myOff + start; i <= (end - srcLen); i++) {
+if (getBufferElement(i) != first) {
+continue;
+}
+// found first char, now look for a match
+int myPos = i + 1;
+for (int srcPos = srcOff + 1; srcPos < srcEnd;) {
+if (getBufferElement(myPos++) != src.charAt(srcPos++)) {
+continue mainLoop;
+}
+}
+return i - start; // found it
+}
+return -1;
+}
+
+
/**
* Resets the chunk to an uninitialized state.
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1821251&r1=1821250&r2=1821251&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan 16
14:39:28 2018
@@ -731,29 +731,6 @@ public final class ByteChunk extends Abs
}
-public int indexOf(String src, int srcOff, int srcLen, int myOff) {
-char first = src.charAt(srcOff);
-
-// Look for first char
-int srcEnd = srcOff + srcLen;
-
-mainLoop: for (int i = myOff + start; i <= (end - srcLen); i++) {
-if (buff[i] != first) {
-continue;
-}
-// found first char, now look for a match
-int myPos = i + 1;
-for (int srcPos = srcOff + 1; srcPos < srcEnd;) {
-if (buff[myPos++] != src.charAt(srcPos++)) {
-continue mainLoop;
-}
-}
-return i - start; // found it
-}
-return -1;
-}
-
-
@Override
protected int getBufferElement(int index) {
return buff[index];
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1821251&r1=1821250&r2=1821251&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jan 16
14:39:28 2018
@@ -605,35 +605,6 @@ public final class CharChunk extends Abs
}
-public int indexOf(String src, int srcOff, int srcLen, int myOff) {
-char first = src.charAt(srcOff);
-
-// Look for first char
-int srcEnd = srcOff + srcLen;
-
-for (int i = myOff + start; i <= (end - srcLen); i++) {
-if (buff[i] != first) {
-continue;
-}
-// Special case - search string is a single character
-if (srcLen == 1) {
-return i - start;
-}
-// Found first char, now look for a match
-int myPos = i + 1;
-for (int srcPos = srcOff + 1; srcPos < srcEnd;) {
-if (buff[myPos++] != src.charAt(srcPos++)) {
-break;
-}
-if (srcPos == srcEnd) {
-return i - start; // found it
-}
-}
-}
-return -1;
-}
-
-
@Override
protected int getBufferElement(int index) {
return buff[index];
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1821252 - /tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Author: markt
Date: Tue Jan 16 14:42:52 2018
New Revision: 1821252
URL: http://svn.apache.org/viewvc?rev=1821252&view=rev
Log:
Deprecated unused code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1821252&r1=1821251&r2=1821252&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jan 16
14:42:52 2018
@@ -78,8 +78,6 @@ public final class CharChunk extends Abs
private transient CharInputChannel in = null;
private transient CharOutputChannel out = null;
-private boolean optimizedWrite = true;
-
/**
* Creates a new, uninitialized CharChunk object.
@@ -115,11 +113,6 @@ public final class CharChunk extends Abs
}
-public void setOptimizedWrite(boolean optimizedWrite) {
-this.optimizedWrite = optimizedWrite;
-}
-
-
/**
* Sets the buffer to the specified subarray of characters.
*
@@ -234,7 +227,7 @@ public final class CharChunk extends Abs
// If the buffer is empty and the source is going to fill up all the
// space in buffer, may as well write it directly to the output,
// and avoid an extra copy
-if (optimizedWrite && len == limit && end == start && out != null) {
+if (len == limit && end == start && out != null) {
out.realWriteChars(src, off, len);
return;
}
@@ -693,4 +686,15 @@ public final class CharChunk extends Abs
return end - start;
}
+/**
+ * NO-OP.
+ *
+ * @param optimizedWrite Ignored
+ *
+ * @deprecated Unused code. This is now a NO-OP and will be removed without
+ * replacement in Tomcat 10.
+ */
+@Deprecated
+public void setOptimizedWrite(boolean optimizedWrite) {
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1821263 - in /tomcat/trunk/bin: ciphers.bat ciphers.sh
Author: kkolinko Date: Tue Jan 16 16:36:17 2018 New Revision: 1821263 URL: http://svn.apache.org/viewvc?rev=1821263&view=rev Log: Set svn:eol-style=native Modified: tomcat/trunk/bin/ciphers.bat (props changed) tomcat/trunk/bin/ciphers.sh (props changed) Propchange: tomcat/trunk/bin/ciphers.bat -- svn:eol-style = native Propchange: tomcat/trunk/bin/ciphers.sh -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: 8.5.25 release build
2018-01-16 16:53 GMT+03:00 Mark Thomas : > > Our friendly Symantec (well, Digicert now) contact has got the issue > fixed. I'll have the 8.5.26 RC out later today. Reviewing the commits for 8.5.25, there is a copy-paste bug in BZ 61916 fix. java/org/apache/catalina/filters/AddDefaultCharsetFilter.java s/super.setHeader()/super.addHeader()/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61916] AddDefaultCharsetFilter wouldn't work when setting response header through response.setHeader()
https://bz.apache.org/bugzilla/show_bug.cgi?id=61916 Konstantin Kolinko changed: What|Removed |Added Resolution|FIXED |--- Status|RESOLVED|REOPENED --- Comment #2 from Konstantin Kolinko --- Implementation of addHeader() in r1820138 is broken: it needs to call super.addHeader(). This concerns 9.0.3 (currently being voted as a release candidate). A fix is trivial, but maybe it is worth to extend the unit tests that were created for this issue. -- 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: r1821293 - in /tomcat/trunk: java/org/apache/tomcat/util/buf/ test/org/apache/tomcat/util/buf/ webapps/docs/
Author: markt
Date: Tue Jan 16 19:29:39 2018
New Revision: 1821293
URL: http://svn.apache.org/viewvc?rev=1821293&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61993
Improve handling for ByteChunk and CharChunk instances that grow close to the
maximum size allowed by the JRE.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java?rev=1821293&r1=1821292&r2=1821293&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java Tue Jan 16
19:29:39 2018
@@ -25,17 +25,53 @@ public abstract class AbstractChunk impl
private static final long serialVersionUID = 1L;
+/*
+ * JVMs may limit the maximum array size to slightly less than
+ * Integer.MAX_VALUE. On markt's desktop the limit is MAX_VALUE - 2.
+ * Comments in the JRE source code for ArrayList and other classes indicate
+ * that it may be as low as MAX_VALUE - 8 on some systems.
+ */
+public static final int ARRAY_MAX_SIZE = Integer.MAX_VALUE - 8;
private int hashCode = 0;
protected boolean hasHashCode = false;
protected boolean isSet;
+private int limit = -1;
+
protected int start;
protected int end;
/**
+ * Maximum amount of data in this buffer. If -1 or not set, the buffer will
+ * grow to {{@link #ARRAY_MAX_SIZE}. Can be smaller than the current buffer
+ * size ( which will not shrink ). When the limit is reached, the buffer
+ * will be flushed (if out is set) or throw exception.
+ *
+ * @param limit The new limit
+ */
+public void setLimit(int limit) {
+this.limit = limit;
+}
+
+
+public int getLimit() {
+return limit;
+}
+
+
+protected int getLimitInternal() {
+if (limit > 0) {
+return limit;
+} else {
+return ARRAY_MAX_SIZE;
+}
+}
+
+
+/**
* @return the start position of the data in the buffer
*/
public int getStart() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1821293&r1=1821292&r2=1821293&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan 16
19:29:39 2018
@@ -130,10 +130,6 @@ public final class ByteChunk extends Abs
// byte[]
private byte[] buff;
-// -1: grow indefinitely
-// maximum amount to be cached
-private int limit = -1;
-
// transient as serialization is primarily for values via, e.g. JMX
private transient ByteInputChannel in = null;
private transient ByteOutputChannel out = null;
@@ -182,7 +178,7 @@ public final class ByteChunk extends Abs
if (buff == null || buff.length < initial) {
buff = new byte[initial];
}
-this.limit = limit;
+setLimit(limit);
start = 0;
end = 0;
isSet = true;
@@ -236,24 +232,6 @@ public final class ByteChunk extends Abs
/**
- * Maximum amount of data in this buffer. If -1 or not set, the buffer will
- * grow indefinitely. Can be smaller than the current buffer size ( which
- * will not shrink ). When the limit is reached, the buffer will be flushed
- * ( if out is set ) or throw exception.
- *
- * @param limit The new limit
- */
-public void setLimit(int limit) {
-this.limit = limit;
-}
-
-
-public int getLimit() {
-return limit;
-}
-
-
-/**
* When the buffer is empty, read the data from the input channel.
*
* @param in The input channel
@@ -279,9 +257,10 @@ public final class ByteChunk extends Abs
public void append(byte b) throws IOException {
makeSpace(1);
+int limit = getLimitInternal();
// couldn't make space
-if (limit > 0 && end >= limit) {
+if (end >= limit) {
flushBuffer();
}
buff[end++] = b;
@@ -304,14 +283,7 @@ public final class ByteChunk extends Abs
public void append(byte src[], int off, int len) throws IOException {
// will grow, up to limit
makeSpace(len);
-
-// if we don't have lim
svn commit: r24244 [2/2] - in /dev/tomcat/tomcat-8/v8.5.26: ./ bin/ bin/embed/ bin/extras/ src/
Propchange: dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.asc == --- dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.asc (added) +++ dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.asc Tue Jan 16 19:54:25 2018 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iEYEABECAAYFAlpd8CYACgkQb7IeiTPGAkM/RACglGI6GYA2FCzPXE0ezhN8mNr6 +ohcAn2+K/cFo/yzevglO4IHtqeIvZy22 +=E2P7 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.md5 == --- dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.md5 (added) +++ dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.md5 Tue Jan 16 19:54:25 2018 @@ -0,0 +1 @@ +52924894fd189ef0ece1aa30e903acce *apache-tomcat-8.5.26-src.zip \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.sha1 == --- dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.sha1 (added) +++ dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.sha1 Tue Jan 16 19:54:25 2018 @@ -0,0 +1 @@ +50bf9e7998b03675f39c733978341ddc93833adb *apache-tomcat-8.5.26-src.zip \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.sha512 == --- dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.sha512 (added) +++ dev/tomcat/tomcat-8/v8.5.26/src/apache-tomcat-8.5.26-src.zip.sha512 Tue Jan 16 19:54:25 2018 @@ -0,0 +1 @@ +4effd1d1432456920835b2d9736e5c9c67b1466e50a09c156e6d8a9d022319e63bcae5471d94701d68b3f1ff0c09ab08b57df589b0a27e86e27508db8dc9d554 *apache-tomcat-8.5.26-src.zip \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r24244 [1/2] - in /dev/tomcat/tomcat-8/v8.5.26: ./ bin/ bin/embed/ bin/extras/ src/
Author: markt Date: Tue Jan 16 19:54:25 2018 New Revision: 24244 Log: Upload 8.5.26 for voting Added: dev/tomcat/tomcat-8/v8.5.26/ dev/tomcat/tomcat-8/v8.5.26/KEYS dev/tomcat/tomcat-8/v8.5.26/README.html dev/tomcat/tomcat-8/v8.5.26/RELEASE-NOTES dev/tomcat/tomcat-8/v8.5.26/bin/ dev/tomcat/tomcat-8/v8.5.26/bin/README.html dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-deployer.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-deployer.tar.gz.asc dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-deployer.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-deployer.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-deployer.tar.gz.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-deployer.zip (with props) dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-deployer.zip.asc dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-deployer.zip.md5 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-deployer.zip.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-deployer.zip.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-fulldocs.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-fulldocs.tar.gz.asc dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-fulldocs.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-fulldocs.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-windows-x64.zip (with props) dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-windows-x64.zip.asc dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-windows-x64.zip.md5 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-windows-x64.zip.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-windows-x64.zip.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-windows-x86.zip (with props) dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-windows-x86.zip.asc dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-windows-x86.zip.md5 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-windows-x86.zip.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26-windows-x86.zip.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.exe (with props) dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.exe.asc dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.exe.md5 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.exe.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.exe.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.tar.gz.asc dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.tar.gz.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.zip (with props) dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.zip.asc dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.zip.md5 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.zip.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/apache-tomcat-8.5.26.zip.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/embed/ dev/tomcat/tomcat-8/v8.5.26/bin/embed/apache-tomcat-8.5.26-embed.tar.gz (with props) dev/tomcat/tomcat-8/v8.5.26/bin/embed/apache-tomcat-8.5.26-embed.tar.gz.asc dev/tomcat/tomcat-8/v8.5.26/bin/embed/apache-tomcat-8.5.26-embed.tar.gz.md5 dev/tomcat/tomcat-8/v8.5.26/bin/embed/apache-tomcat-8.5.26-embed.tar.gz.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/embed/apache-tomcat-8.5.26-embed.tar.gz.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/embed/apache-tomcat-8.5.26-embed.zip (with props) dev/tomcat/tomcat-8/v8.5.26/bin/embed/apache-tomcat-8.5.26-embed.zip.asc dev/tomcat/tomcat-8/v8.5.26/bin/embed/apache-tomcat-8.5.26-embed.zip.md5 dev/tomcat/tomcat-8/v8.5.26/bin/embed/apache-tomcat-8.5.26-embed.zip.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/embed/apache-tomcat-8.5.26-embed.zip.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/extras/ dev/tomcat/tomcat-8/v8.5.26/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-8/v8.5.26/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-8/v8.5.26/bin/extras/catalina-jmx-remote.jar.md5 dev/tomcat/tomcat-8/v8.5.26/bin/extras/catalina-jmx-remote.jar.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/extras/catalina-jmx-remote.jar.sha512 dev/tomcat/tomcat-8/v8.5.26/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-8/v8.5.26/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-8/v8.5.26/bin/extras/catalina-ws.jar.md5 dev/tomcat/tomcat-8/v8.5.26/bin/extras/catalina-ws.jar.sha1 dev/tomcat/tomcat-8/v8.5.26/bin/extras/catalina-ws.jar.sha512 dev/tomcat/tomc
svn commit: r1821297 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/buf/AbstractChunk.java java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.java tes
Author: markt Date: Tue Jan 16 20:01:04 2018 New Revision: 1821297 URL: http://svn.apache.org/viewvc?rev=1821297&view=rev Log: Clean-up prior to fixing BZ 61993 Added: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java - copied, changed from r1821197, tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 20:01:04 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,176
svn commit: r1821300 - in /tomcat/tc8.5.x/trunk: ./ build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: markt Date: Tue Jan 16 20:07:46 2018 New Revision: 1821300 URL: http://svn.apache.org/viewvc?rev=1821300&view=rev Log: Increment version for next development cycle Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/build.properties.default tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 20:07:46 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505
svn commit: r1821301 - in /tomcat/tc8.5.x/trunk: java/org/apache/tomcat/util/buf/ test/org/apache/tomcat/util/buf/ webapps/docs/
Author: markt
Date: Tue Jan 16 20:09:12 2018
New Revision: 1821301
URL: http://svn.apache.org/viewvc?rev=1821301&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61993
Improve handling for ByteChunk and CharChunk instances that grow close to the
maximum size allowed by the JRE.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java?rev=1821301&r1=1821300&r2=1821301&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java Tue
Jan 16 20:09:12 2018
@@ -25,17 +25,53 @@ public abstract class AbstractChunk impl
private static final long serialVersionUID = 1L;
+/*
+ * JVMs may limit the maximum array size to slightly less than
+ * Integer.MAX_VALUE. On markt's desktop the limit is MAX_VALUE - 2.
+ * Comments in the JRE source code for ArrayList and other classes indicate
+ * that it may be as low as MAX_VALUE - 8 on some systems.
+ */
+public static final int ARRAY_MAX_SIZE = Integer.MAX_VALUE - 8;
private int hashCode = 0;
protected boolean hasHashCode = false;
protected boolean isSet;
+private int limit = -1;
+
protected int start;
protected int end;
/**
+ * Maximum amount of data in this buffer. If -1 or not set, the buffer will
+ * grow to {{@link #ARRAY_MAX_SIZE}. Can be smaller than the current buffer
+ * size ( which will not shrink ). When the limit is reached, the buffer
+ * will be flushed (if out is set) or throw exception.
+ *
+ * @param limit The new limit
+ */
+public void setLimit(int limit) {
+this.limit = limit;
+}
+
+
+public int getLimit() {
+return limit;
+}
+
+
+protected int getLimitInternal() {
+if (limit > 0) {
+return limit;
+} else {
+return ARRAY_MAX_SIZE;
+}
+}
+
+
+/**
* @return the start position of the data in the buffer
*/
public int getStart() {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1821301&r1=1821300&r2=1821301&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan
16 20:09:12 2018
@@ -128,10 +128,6 @@ public final class ByteChunk extends Abs
// byte[]
private byte[] buff;
-// -1: grow indefinitely
-// maximum amount to be cached
-private int limit = -1;
-
private ByteInputChannel in = null;
private ByteOutputChannel out = null;
@@ -166,7 +162,7 @@ public final class ByteChunk extends Abs
if (buff == null || buff.length < initial) {
buff = new byte[initial];
}
-this.limit = limit;
+setLimit(limit);
start = 0;
end = 0;
isSet = true;
@@ -220,24 +216,6 @@ public final class ByteChunk extends Abs
/**
- * Maximum amount of data in this buffer. If -1 or not set, the buffer will
- * grow indefinitely. Can be smaller than the current buffer size ( which
- * will not shrink ). When the limit is reached, the buffer will be flushed
- * ( if out is set ) or throw exception.
- *
- * @param limit The new limit
- */
-public void setLimit(int limit) {
-this.limit = limit;
-}
-
-
-public int getLimit() {
-return limit;
-}
-
-
-/**
* When the buffer is empty, read the data from the input channel.
*
* @param in The input channel
@@ -263,9 +241,10 @@ public final class ByteChunk extends Abs
public void append(byte b) throws IOException {
makeSpace(1);
+int limit = getLimitInternal();
// couldn't make space
-if (limit > 0 && end >= limit) {
+if (end >= limit) {
flushBuffer();
}
buff[end++] = b;
@@ -288,14 +267,7 @@ public final class ByteChunk extends Abs
public void append(byte src[], int off, int len) throws IOException {
// will grow, up to limit
makeSpace(len);
-
-
svn commit: r1821303 - in /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf: ByteChunk.java CharChunk.java
Author: markt
Date: Tue Jan 16 20:30:05 2018
New Revision: 1821303
URL: http://svn.apache.org/viewvc?rev=1821303&view=rev
Log:
Back-port preparation.
Fix formatting. No functional change.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1821303&r1=1821302&r2=1821303&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan
16 20:30:05 2018
@@ -41,16 +41,15 @@ import java.nio.charset.StandardCharsets
// inside this way it could provide the search/etc on ByteBuffer, as a helper.
/**
- * This class is used to represent a chunk of bytes, and
- * utilities to manipulate byte[].
+ * This class is used to represent a chunk of bytes, and utilities to
manipulate
+ * byte[].
*
* The buffer can be modified and used for both input and output.
*
* There are 2 modes: The chunk can be associated with a sink -
ByteInputChannel
* or ByteOutputChannel, which will be used when the buffer is empty (on input)
- * or filled (on output).
- * For output, it can also grow. This operating mode is selected by calling
- * setLimit() or allocate(initial, limit) with limit != -1.
+ * or filled (on output). For output, it can also grow. This operating mode is
+ * selected by calling setLimit() or allocate(initial, limit) with limit != -1.
*
* Various search and append method are defined - similar with String and
* StringBuffer, but operating on bytes.
@@ -69,59 +68,63 @@ public final class ByteChunk implements
private static final long serialVersionUID = 1L;
-/** Input interface, used when the buffer is empty
+/**
+ * Input interface, used when the buffer is empty
*
* Same as java.nio.channel.ReadableByteChannel
*/
public static interface ByteInputChannel {
+
/**
- * Read new bytes ( usually the internal conversion buffer ).
- * The implementation is allowed to ignore the parameters,
- * and mutate the chunk if it wishes to implement its own buffering.
+ * Read new bytes ( usually the internal conversion buffer ). The
+ * implementation is allowed to ignore the parameters, and mutate the
+ * chunk if it wishes to implement its own buffering.
*/
-public int realReadBytes(byte cbuf[], int off, int len)
-throws IOException;
+public int realReadBytes(byte cbuf[], int off, int len) throws
IOException;
}
-/** Same as java.nio.channel.WritableByteChannel.
+/**
+ * Same as java.nio.channel.WritableByteChannel.
*/
public static interface ByteOutputChannel {
+
/**
- * Send the bytes ( usually the internal conversion buffer ).
- * Expect 8k output if the buffer is full.
+ * Send the bytes ( usually the internal conversion buffer ). Expect 8k
+ * output if the buffer is full.
*/
-public void realWriteBytes(byte cbuf[], int off, int len)
-throws IOException;
+public void realWriteBytes(byte cbuf[], int off, int len) throws
IOException;
}
//
-/** Default encoding used to convert to strings. It should be UTF8,
-as most standards seem to converge, but the servlet API requires
-8859_1, and this object is used mostly for servlets.
-*/
+/**
+ * Default encoding used to convert to strings. It should be UTF8, as most
+ * standards seem to converge, but the servlet API requires 8859_1, and
this
+ * object is used mostly for servlets.
+ */
public static final Charset DEFAULT_CHARSET = StandardCharsets.ISO_8859_1;
-private int hashCode=0;
+private int hashCode = 0;
// did we compute the hashcode ?
private boolean hasHashCode = false;
// byte[]
private byte[] buff;
-private int start=0;
+private int start = 0;
private int end;
private Charset charset;
-private boolean isSet=false; // XXX
+private boolean isSet = false; // XXX
// How much can it grow, when data is added
-private int limit=-1;
+private int limit = -1;
private ByteInputChannel in = null;
private ByteOutputChannel out = null;
+
/**
* Creates a new, uninitialized ByteChunk object.
*/
@@ -129,43 +132,49 @@ public final class ByteChunk implements
// NO-OP
}
-public ByteChunk( int initial ) {
-allocate( initial, -1 );
+
+public ByteChunk(int initial) {
+allocate(initial, -1);
}
+
public boolean isNull() {
-
svn commit: r1821304 - in /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf: AbstractChunk.java ByteChunk.java CharChunk.java
Author: markt
Date: Tue Jan 16 20:31:16 2018
New Revision: 1821304
URL: http://svn.apache.org/viewvc?rev=1821304&view=rev
Log:
Add a base class with a view to aligning and pulling up the common code where
possible.
Added:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
- copied unchanged from r1821197,
tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1821304&r1=1821303&r2=1821304&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan
16 20:31:16 2018
@@ -17,7 +17,6 @@
package org.apache.tomcat.util.buf;
import java.io.IOException;
-import java.io.Serializable;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
@@ -64,7 +63,7 @@ import java.nio.charset.StandardCharsets
* @author Costin Manolache
* @author Remy Maucherat
*/
-public final class ByteChunk implements Cloneable, Serializable {
+public final class ByteChunk extends AbstractChunk {
private static final long serialVersionUID = 1L;
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1821304&r1=1821303&r2=1821304&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jan
16 20:31:16 2018
@@ -17,7 +17,6 @@
package org.apache.tomcat.util.buf;
import java.io.IOException;
-import java.io.Serializable;
/**
* Utilities to manipulate char chunks. While String is the easiest way to
@@ -29,7 +28,7 @@ import java.io.Serializable;
* @author Costin Manolache
* @author Remy Maucherat
*/
-public final class CharChunk implements Cloneable, Serializable, CharSequence {
+public final class CharChunk extends AbstractChunk implements CharSequence {
private static final long serialVersionUID = 1L;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1821305 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/buf/AbstractChunk.java java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.java
Author: markt Date: Tue Jan 16 20:33:24 2018 New Revision: 1821305 URL: http://svn.apache.org/viewvc?rev=1821305&view=rev Log: Pull up and align start (a.k.a. offset), end and hashcode Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 20:33:24 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,
svn commit: r1821306 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/buf/AbstractChunk.java java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.java
Author: markt Date: Tue Jan 16 20:35:00 2018 New Revision: 1821306 URL: http://svn.apache.org/viewvc?rev=1821306&view=rev Log: Pull up and align isNull and recycle Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 20:35:00 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,16823
svn commit: r1821307 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.java
Author: markt Date: Tue Jan 16 20:35:44 2018 New Revision: 1821307 URL: http://svn.apache.org/viewvc?rev=1821307&view=rev Log: Reduce diff between ByteChunk and CharChunk No functional change Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 20:35:44 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,16843
svn commit: r1821308 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.java
Author: markt Date: Tue Jan 16 20:36:27 2018 New Revision: 1821308 URL: http://svn.apache.org/viewvc?rev=1821308&view=rev Log: Formatting / comment alignment Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 20:36:27 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684
svn commit: r1821309 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.java
Author: markt Date: Tue Jan 16 20:40:34 2018 New Revision: 1821309 URL: http://svn.apache.org/viewvc?rev=1821309&view=rev Log: More alignment. Comment differences. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 20:40:34 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
svn commit: r1821310 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.java
Author: markt Date: Tue Jan 16 20:44:50 2018 New Revision: 1821310 URL: http://svn.apache.org/viewvc?rev=1821310&view=rev Log: Clean up - No functional change Align comments and variable names, re-order methods, etc. to minimise diff between ByteChunk and CharChunk Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 20:44:50 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,16
svn commit: r1821311 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/buf/CharChunk.java test/org/apache/tomcat/util/buf/TestCharChunk.java
Author: markt Date: Tue Jan 16 20:45:42 2018 New Revision: 1821311 URL: http://svn.apache.org/viewvc?rev=1821311&view=rev Log: Fix bug searching for single character Strings (search would always fail) Bug found during comparison of indexOf() implementations between ByteChunk and CharChunk Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 20:45:42 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,168185
svn commit: r1821313 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/buf/AbstractChunk.java java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.java
Author: markt Date: Tue Jan 16 20:47:00 2018 New Revision: 1821313 URL: http://svn.apache.org/viewvc?rev=1821313&view=rev Log: Align indexOf(String, int, int, int) implementations and pull up. Use ByteChunnks implementation as it is shorter. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 20:47:00 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807
svn commit: r1821314 - in /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf: ByteChunk.java CharChunk.java
Author: markt
Date: Tue Jan 16 21:02:48 2018
New Revision: 1821314
URL: http://svn.apache.org/viewvc?rev=1821314&view=rev
Log:
Review remaining diff between 9.0.x and 8.5.x and back-port remaining changes.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1821314&r1=1821313&r2=1821314&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan
16 21:02:48 2018
@@ -17,6 +17,8 @@
package org.apache.tomcat.util.buf;
import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
@@ -128,8 +130,9 @@ public final class ByteChunk extends Abs
// byte[]
private byte[] buff;
-private ByteInputChannel in = null;
-private ByteOutputChannel out = null;
+// transient as serialization is primarily for values via, e.g. JMX
+private transient ByteInputChannel in = null;
+private transient ByteOutputChannel out = null;
/**
@@ -143,6 +146,19 @@ public final class ByteChunk extends Abs
allocate(initial, -1);
}
+
+private void writeObject(ObjectOutputStream oos) throws IOException {
+oos.defaultWriteObject();
+oos.writeUTF(getCharset().name());
+}
+
+
+private void readObject(ObjectInputStream ois) throws
ClassNotFoundException, IOException {
+ois.defaultReadObject();
+this.charset = Charset.forName(ois.readUTF());
+}
+
+
@Override
public Object clone() throws CloneNotSupportedException {
return super.clone();
@@ -699,6 +715,7 @@ public final class ByteChunk extends Abs
return (ret >= start) ? ret - start : -1;
}
+
/**
* Returns the first instance of the given character in the given byte
array
* between the specified start and end.
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1821314&r1=1821313&r2=1821314&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jan
16 21:02:48 2018
@@ -70,8 +70,9 @@ public final class CharChunk extends Abs
// char[]
private char[] buff;
-private CharInputChannel in = null;
-private CharOutputChannel out = null;
+// transient as serialization is primarily for values via, e.g. JMX
+private transient CharInputChannel in = null;
+private transient CharOutputChannel out = null;
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1821316 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/buf/ test/org/apache/tomcat/util/buf/ webapps/docs/
Author: markt Date: Tue Jan 16 21:21:08 2018 New Revision: 1821316 URL: http://svn.apache.org/viewvc?rev=1821316&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61993 Improve handling for ByteChunk and CharChunk instances that grow close to the maximum size allowed by the JRE. Review 8.5.x/8.0.x diff and align 8.0.x to 8.5.x Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 21:21:08 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,167
svn commit: r1821317 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf: ByteChunk.java CharChunk.java
Author: markt
Date: Tue Jan 16 21:24:25 2018
New Revision: 1821317
URL: http://svn.apache.org/viewvc?rev=1821317&view=rev
Log:
Back-port preparation.
Fix formatting. No functional change.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1821317&r1=1821316&r2=1821317&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan
16 21:24:25 2018
@@ -40,16 +40,15 @@ import java.nio.charset.Charset;
// inside this way it could provide the search/etc on ByteBuffer, as a helper.
/**
- * This class is used to represent a chunk of bytes, and
- * utilities to manipulate byte[].
+ * This class is used to represent a chunk of bytes, and utilities to
manipulate
+ * byte[].
*
* The buffer can be modified and used for both input and output.
*
* There are 2 modes: The chunk can be associated with a sink -
ByteInputChannel
* or ByteOutputChannel, which will be used when the buffer is empty (on input)
- * or filled (on output).
- * For output, it can also grow. This operating mode is selected by calling
- * setLimit() or allocate(initial, limit) with limit != -1.
+ * or filled (on output). For output, it can also grow. This operating mode is
+ * selected by calling setLimit() or allocate(initial, limit) with limit != -1.
*
* Various search and append method are defined - similar with String and
* StringBuffer, but operating on bytes.
@@ -68,60 +67,64 @@ public final class ByteChunk implements
private static final long serialVersionUID = 1L;
-/** Input interface, used when the buffer is empty
+/**
+ * Input interface, used when the buffer is empty
*
* Same as java.nio.channel.ReadableByteChannel
*/
public static interface ByteInputChannel {
+
/**
- * Read new bytes ( usually the internal conversion buffer ).
- * The implementation is allowed to ignore the parameters,
- * and mutate the chunk if it wishes to implement its own buffering.
+ * Read new bytes ( usually the internal conversion buffer ). The
+ * implementation is allowed to ignore the parameters, and mutate the
+ * chunk if it wishes to implement its own buffering.
*/
-public int realReadBytes(byte cbuf[], int off, int len)
-throws IOException;
+public int realReadBytes(byte cbuf[], int off, int len) throws
IOException;
}
-/** Same as java.nio.channel.WritableByteChannel.
+/**
+ * Same as java.nio.channel.WritableByteChannel.
*/
public static interface ByteOutputChannel {
+
/**
- * Send the bytes ( usually the internal conversion buffer ).
- * Expect 8k output if the buffer is full.
+ * Send the bytes ( usually the internal conversion buffer ). Expect 8k
+ * output if the buffer is full.
*/
-public void realWriteBytes(byte cbuf[], int off, int len)
-throws IOException;
+public void realWriteBytes(byte cbuf[], int off, int len) throws
IOException;
}
//
-/** Default encoding used to convert to strings. It should be UTF8,
-as most standards seem to converge, but the servlet API requires
-8859_1, and this object is used mostly for servlets.
-*/
+/**
+ * Default encoding used to convert to strings. It should be UTF8, as most
+ * standards seem to converge, but the servlet API requires 8859_1, and
this
+ * object is used mostly for servlets.
+ */
public static final Charset DEFAULT_CHARSET = B2CConverter.ISO_8859_1;
-private int hashCode=0;
+private int hashCode = 0;
// did we compute the hashcode ?
private boolean hasHashCode = false;
// byte[]
private byte[] buff;
-private int start=0;
+private int start = 0;
private int end;
private Charset charset;
-private boolean isSet=false; // XXX
+private boolean isSet = false; // XXX
// How much can it grow, when data is added
-private int limit=-1;
+private int limit = -1;
private ByteInputChannel in = null;
private ByteOutputChannel out = null;
-private boolean optimizedWrite=true;
+private boolean optimizedWrite = true;
+
/**
* Creates a new, uninitialized ByteChunk object.
@@ -130,55 +133,62 @@ public final class ByteChunk implements
// NO-OP
}
-public ByteChunk( int initial ) {
-allocate( initial, -1 );
+
+public ByteChunk(int initial) {
+alloca
svn commit: r1821319 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/AbstractChunk.java java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.ja
Author: markt Date: Tue Jan 16 21:48:41 2018 New Revision: 1821319 URL: http://svn.apache.org/viewvc?rev=1821319&view=rev Log: Back-port clean-up / refactoring / alignment Added: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java - copied, changed from r1821304, tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 21:48:41 2018 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,181
svn commit: r1821319 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/AbstractChunk.java java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.ja
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1821319&r1=1821318&r2=1821319&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jan
16 21:48:41 2018
@@ -17,7 +17,6 @@
package org.apache.tomcat.util.buf;
import java.io.IOException;
-import java.io.Serializable;
/**
* Utilities to manipulate char chunks. While String is the easiest way to
@@ -29,17 +28,21 @@ import java.io.Serializable;
* @author Costin Manolache
* @author Remy Maucherat
*/
-public final class CharChunk implements Cloneable, Serializable, CharSequence {
+public final class CharChunk extends AbstractChunk implements CharSequence {
private static final long serialVersionUID = 1L;
-// Input interface, used when the buffer is emptied.
+/**
+ * Input interface, used when the buffer is empty.
+ */
public static interface CharInputChannel {
/**
- * Read new bytes ( usually the internal conversion buffer ). The
- * implementation is allowed to ignore the parameters, and mutate the
- * chunk if it wishes to implement its own buffering.
+ * Read new characters.
+ *
+ * @return The number of characters read
+ *
+ * @throws IOException If an I/O error occurs during reading
*/
public int realReadChars(char cbuf[], int off, int len) throws
IOException;
}
@@ -53,23 +56,19 @@ public final class CharChunk implements
/**
* Send the bytes ( usually the internal conversion buffer ). Expect 8k
* output if the buffer is full.
+ *
+ * @param buf characters that will be written
+ * @param off offset in the characters array
+ * @param len length that will be written
+ * @throws IOException If an I/O occurs while writing the characters
*/
-public void realWriteChars(char cbuf[], int off, int len) throws
IOException;
+public void realWriteChars(char buf[], int off, int len) throws
IOException;
}
//
-private int hashCode = 0;
-// did we compute the hashcode ?
-private boolean hasHashCode = false;
-
// char[]
-private char buff[];
-
-private int start;
-private int end;
-
-private boolean isSet = false; // XXX
+private char[] buff;
// -1: grow indefinitely
// maximum amount to be cached
@@ -88,8 +87,8 @@ public final class CharChunk implements
}
-public CharChunk(int size) {
-allocate(size, -1);
+public CharChunk(int initial) {
+allocate(initial, -1);
}
@@ -108,26 +107,6 @@ public final class CharChunk implements
}
-public boolean isNull() {
-if (end > 0) {
-return false;
-}
-return !isSet; // XXX
-}
-
-
-/**
- * Resets the message bytes to an uninitialized state.
- */
-public void recycle() {
-// buff=null;
-isSet = false; // XXX
-hasHashCode = false;
-start = 0;
-end = 0;
-}
-
-
/**
* @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
@@ -156,6 +135,13 @@ public final class CharChunk implements
}
+/**
+ * Sets the buffer to the specified subarray of characters.
+ *
+ * @param c the characters
+ * @param off the start offset of the characters
+ * @param len the length of the characters
+ */
public void setChars(char[] c, int off, int len) {
buff = c;
start = off;
@@ -166,6 +152,22 @@ public final class CharChunk implements
/**
+ * @return the buffer.
+ */
+public char[] getChars() {
+return getBuffer();
+}
+
+
+/**
+ * @return the buffer.
+ */
+public char[] getBuffer() {
+return buff;
+}
+
+
+/**
* Maximum amount of data in this buffer.
*
* If -1 or not set, the buffer will grow indefinitely. Can be smaller than
@@ -201,58 +203,7 @@ public final class CharChunk implements
}
-// compat
-public char[] getChars() {
-return getBuffer();
-}
-
-
-public char[] getBuffer() {
-return buff;
-}
-
-
-/**
- * Returns the start offset of the bytes. For output this is the end of the
- * buffer.
- */
-public int getStart() {
-return start;
-}
-
-
-public int getOffset() {
-return start;
-}
-
-
-/**
- * Returns the start offset of the bytes.
- */
-public void setOffset(int off) {
-start = off;
-}
-
-
-/**
- * Returns the length of the bytes.
- */
-public int getLength() {
-
svn commit: r1821320 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/CharChunk.java test/org/apache/tomcat/util/buf/TestCharChunk.java
Author: markt Date: Tue Jan 16 21:49:38 2018 New Revision: 1821320 URL: http://svn.apache.org/viewvc?rev=1821320&view=rev Log: Fix bug searching for single character Strings (search would always fail) Bug found during comparison of indexOf() implementations between ByteChunk and CharChunk Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 21:49:38 2018 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,182
svn commit: r1821321 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/AbstractChunk.java java/org/apache/tomcat/util/buf/ByteChunk.java java/org/apache/tomcat/util/buf/CharChunk.java
Author: markt Date: Tue Jan 16 21:50:48 2018 New Revision: 1821321 URL: http://svn.apache.org/viewvc?rev=1821321&view=rev Log: Align indexOf(String, int, int, int) implementations and pull up. Use ByteChunks implementation as it is shorter. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 21:50:48 2018 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,18172
svn commit: r1821322 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/ test/org/apache/tomcat/util/buf/ webapps/docs/
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java?rev=1821322&r1=1821321&r2=1821322&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java Tue
Jan 16 21:56:18 2018
@@ -16,12 +16,16 @@
*/
package org.apache.tomcat.util.buf;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
+import org.apache.tomcat.util.buf.ByteChunk.ByteOutputChannel;
+
/**
* Test cases for {@link ByteChunk}.
*/
@@ -35,7 +39,7 @@ public class TestByteChunk {
Assert.assertTrue(Arrays.equals(bytes, expected));
}
-/**
+/*
* Test for {@code findByte} vs. {@code indexOf} methods difference.
*
*
@@ -70,6 +74,7 @@ public class TestByteChunk {
Assert.assertEquals(-1, ByteChunk.indexOf(bytes, 5, 5, 'w'));
}
+
@Test
public void testIndexOf_Char() throws UnsupportedEncodingException {
byte[] bytes = "Hello\u00a0world".getBytes("ISO-8859-1");
@@ -92,6 +97,7 @@ public class TestByteChunk {
Assert.assertEquals(-1, bc.indexOf('d', 0));
}
+
@Test
public void testIndexOf_String() throws UnsupportedEncodingException {
byte[] bytes = "Hello\u00a0world".getBytes("ISO-8859-1");
@@ -117,6 +123,7 @@ public class TestByteChunk {
Assert.assertEquals(-1, bc.indexOf("d", 0, 1, 0));
}
+
@Test
public void testFindBytes() throws UnsupportedEncodingException {
byte[] bytes = "Hello\u00a0world".getBytes("ISO-8859-1");
@@ -134,6 +141,7 @@ public class TestByteChunk {
Assert.assertEquals(-1, ByteChunk.findBytes(bytes, 2, 5, new byte[] {
'w' }));
}
+
@Test
@Deprecated
public void testFindNotBytes() throws UnsupportedEncodingException {
@@ -146,4 +154,30 @@ public class TestByteChunk {
Assert.assertEquals(-1, ByteChunk.findNotBytes(bytes, 2, 3, new byte[]
{ 'l',
'e', 'H' }));
}
+
+
+@Ignore // Requires a 6GB heap (on markt's desktop - YMMV)
+@Test
+public void testAppend() throws Exception {
+ByteChunk bc = new ByteChunk();
+bc.setByteOutputChannel(new Sink());
+// Defaults to no limit
+
+byte data[] = new byte[32 * 1024 * 1024];
+
+for (int i = 0; i < 100; i++) {
+bc.append(data, 0, data.length);
+}
+
+Assert.assertEquals(AbstractChunk.ARRAY_MAX_SIZE,
bc.getBuffer().length);
+}
+
+
+public class Sink implements ByteOutputChannel {
+
+@Override
+public void realWriteBytes(byte[] cbuf, int off, int len) throws
IOException {
+// NO-OP
+}
+}
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java?rev=1821322&r1=1821321&r2=1821322&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java Tue
Jan 16 21:56:18 2018
@@ -16,9 +16,14 @@
*/
package org.apache.tomcat.util.buf;
+import java.io.IOException;
+
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
+import org.apache.tomcat.util.buf.CharChunk.CharOutputChannel;
+
/**
* Test cases for {@link CharChunk}.
*/
@@ -37,6 +42,7 @@ public class TestCharChunk {
Assert.assertFalse(cc.endsWith("xxtest"));
}
+
@Test
public void testIndexOf_String() {
char[] chars = "Hello\u00a0world".toCharArray();
@@ -62,4 +68,29 @@ public class TestCharChunk {
Assert.assertEquals(-1, cc.indexOf("d", 0, 1, 0));
}
+
+@Ignore // Requires an 11GB heap (on markt's desktop - YMMV)
+@Test
+public void testAppend() throws Exception {
+CharChunk cc = new CharChunk();
+cc.setCharOutputChannel(new Sink());
+// Defaults to no limit
+
+char data[] = new char[32 * 1024 * 1024];
+
+for (int i = 0; i < 100; i++) {
+cc.append(data, 0, data.length);
+}
+
+Assert.assertEquals(AbstractChunk.ARRAY_MAX_SIZE,
cc.getBuffer().length);
+}
+
+
+public class Sink implements CharOutputChannel {
+
+@Override
+public void realWriteChars(char[] cbuf, int off, int len) throws
IOException {
+// NO-OP
+}
+}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/change
svn commit: r1821322 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/ test/org/apache/tomcat/util/buf/ webapps/docs/
Author: markt Date: Tue Jan 16 21:56:18 2018 New Revision: 1821322 URL: http://svn.apache.org/viewvc?rev=1821322&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61993 Improve handling for ByteChunk and CharChunk instances that grow close to the maximum size allowed by the JRE. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestCharChunk.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 21:56:18 2018 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,18
svn commit: r1821327 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Author: markt
Date: Tue Jan 16 22:04:43 2018
New Revision: 1821327
URL: http://svn.apache.org/viewvc?rev=1821327&view=rev
Log:
Fix comment merge.
Align comments.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1821327&r1=1821326&r2=1821327&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jan
16 22:04:43 2018
@@ -308,6 +308,9 @@ public final class CharChunk extends Abs
/**
* Append a string to the buffer
+ *
+ * @param s The string
+ * @throws IOException Writing overflow data to the output channel failed
*/
public void append(String s) throws IOException {
append(s, 0, s.length());
@@ -585,7 +588,6 @@ public final class CharChunk extends Abs
/**
-<<< .working
* @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
@Deprecated
@@ -611,18 +613,9 @@ public final class CharChunk extends Abs
/**
- * Returns true if the message bytes starts with the specified string.
- *
- * @param s the string
-||| .merge-left.r1821315
- * Returns true if the message bytes starts with the specified string.
- *
- * @param s the string
-===
* @return true if the message bytes starts with the specified
* string.
* @param s The string
->>> .merge-right.r1821316
*/
public boolean startsWith(String s) {
char[] c = buff;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61993] org.apache.tomcat.util.ByteChunk throws NegativeArray SizeException
https://bz.apache.org/bugzilla/show_bug.cgi?id=61993 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Mark Thomas --- Fixed in: - trunk for 9.0.4 onwards - 8.5.x for 8.5.27 onwards - 8.0.x for 8.0.49 onwards - 7.0.x for 7.0.84 onwards Thanks for the patch - it is appreciated. It is just that with all the refactoring to reduce duplication and fix the various other edge cases I ended up taking a slightly different approach. -- 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: 8.5.25 release build
On 16/01/18 17:24, Konstantin Kolinko wrote: > 2018-01-16 16:53 GMT+03:00 Mark Thomas : >> >> Our friendly Symantec (well, Digicert now) contact has got the issue >> fixed. I'll have the 8.5.26 RC out later today. > > > Reviewing the commits for 8.5.25, there is a copy-paste bug in BZ 61916 fix. > > java/org/apache/catalina/filters/AddDefaultCharsetFilter.java > > s/super.setHeader()/super.addHeader()/ It affects 9.0.4 and 8.5.26. Views on re-rolling the releases vs carrying on and including this as a known issue? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1821328 - in /tomcat/trunk: java/org/apache/catalina/filters/AddDefaultCharsetFilter.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jan 16 22:28:51 2018
New Revision: 1821328
URL: http://svn.apache.org/viewvc?rev=1821328&view=rev
Log:
Correct a regression in the previous fix for BZ 61916 that meant that any call
to addHeader() would have been replaced with a call to setHeader() for all
requests mapped to the AddDefaultCharsetFilter.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1821328&r1=1821327&r2=1821328&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
Tue Jan 16 22:28:51 2018
@@ -134,7 +134,7 @@ public class AddDefaultCharsetFilter ext
if (name.trim().equalsIgnoreCase("content-type")) {
setContentType(value);
} else {
-super.setHeader(name, value);
+super.addHeader(name, value);
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1821328&r1=1821327&r2=1821328&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 16 22:28:51 2018
@@ -48,6 +48,12 @@
+Correct a regression in the previous fix for 61916 that
meant
+that any call to addHeader() would have been replaced with
+a call to setHeader() for all requests mapped to the
+AddDefaultCharsetFilter. (markt)
+
+
61999: maxSavePostSize set to 0 should disable saving POST
data during authentication. (remm)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1821329 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/AddDefaultCharsetFilter.java webapps/docs/changelog.xml
Author: markt Date: Tue Jan 16 22:30:31 2018 New Revision: 1821329 URL: http://svn.apache.org/viewvc?rev=1821329&view=rev Log: Correct a regression in the previous fix for BZ 61916 that meant that any call to addHeader() would have been replaced with a call to setHeader() for all requests mapped to the AddDefaultCharsetFilter. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 22:30:31 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763
svn commit: r1821330 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
Author: markt Date: Tue Jan 16 22:31:31 2018 New Revision: 1821330 URL: http://svn.apache.org/viewvc?rev=1821330&view=rev Log: Correct a regression in the previous fix for BZ 61916 that meant that any call to addHeader() would have been replaced with a call to setHeader() for all requests mapped to the AddDefaultCharsetFilter. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 22:31:31 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,16
svn commit: r1821331 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
Author: markt Date: Tue Jan 16 22:32:03 2018 New Revision: 1821331 URL: http://svn.apache.org/viewvc?rev=1821331&view=rev Log: Correct a regression in the previous fix for BZ 61916 that meant that any call to addHeader() would have been replaced with a call to setHeader() for all requests mapped to the AddDefaultCharsetFilter. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 16 22:32:03 2018 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305
[Bug 61916] AddDefaultCharsetFilter wouldn't work when setting response header through response.setHeader()
https://bz.apache.org/bugzilla/show_bug.cgi?id=61916 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #3 from Mark Thomas --- Regression fixed in: - trunk for 9.0.4 onwards - 8.5.x for 8.5.27 onwards - 8.0.x for 8.0.49 onwards - 7.0.x for 7.0.84 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 62006] New: Windows Service Command Line Parameter JvmOptions9 is undocumented
https://bz.apache.org/bugzilla/show_bug.cgi?id=62006 Bug ID: 62006 Summary: Windows Service Command Line Parameter JvmOptions9 is undocumented Product: Tomcat 8 Version: 8.5.24 Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: benjaminro...@gmail.com Target Milestone: The Tomcat 8.5.24 service.bat file shows a parameter --JvmOptions9. This parameter does not appear to be documented at https://tomcat.apache.org/tomcat-8.5-doc/windows-service-howto.html#comments_section as of the creation of this bug. -- 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
