[Bug 61351] New: Non-US-ASCII letters in url-mapping
https://bz.apache.org/bugzilla/show_bug.cgi?id=61351 Bug ID: 61351 Summary: Non-US-ASCII letters in url-mapping Product: Tomcat 8 Version: 8.5.15 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Util Assignee: dev@tomcat.apache.org Reporter: tw...@tweek.dk Target Milestone: Created attachment 35182 --> https://bz.apache.org/bugzilla/attachment.cgi?id=35182&action=edit Servlet that logs url-mappings (maven project) Hi, Starting with revision 1793440 (introduced 8.5.15) I can no longer use non-US-ASCII letters in url-mappings i web.xml. This is still true for the latest revision (revision 1803056). This affects my setup, where I have a servlet mapped to /mælk/data . If I URL-encode the url-mapping (/m%C3%A6lk/data) then it works again. I've attached a simple servlet that does nothing except logging it's name and mappings to catalina.out. I have added some non-US-ASCII letters to the servlet name just to make sure that the web.xml is parsed correctly. Kind regards, Martin -- 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: r1803135 - in /tomcat/trunk: java/org/apache/catalina/util/SystemPropertyReplacerListener.java java/org/apache/tomcat/util/digester/Digester.java webapps/docs/config/listeners.xml webapps/
Author: remm
Date: Thu Jul 27 08:25:46 2017
New Revision: 1803135
URL: http://svn.apache.org/viewvc?rev=1803135&view=rev
Log:
Avoid circular dependency.
Added:
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
(with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/webapps/docs/config/listeners.xml
tomcat/trunk/webapps/docs/config/systemprops.xml
Added:
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java?rev=1803135&view=auto
==
---
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
Thu Jul 27 08:25:46 2017
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.catalina.util;
+
+
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.tomcat.util.digester.Digester;
+
+
+/**
+ * Helper class used to do property replacement on system properties.
+ */
+public class SystemPropertyReplacerListener
+implements LifecycleListener {
+
+
+// -- LifecycleListener Methods
+
+
+@Override
+public void lifecycleEvent(LifecycleEvent event) {
+if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
+Digester.replace();
+}
+}
+
+
+}
Propchange:
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
--
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1803135&r1=1803134&r2=1803135&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Thu Jul 27
08:25:46 2017
@@ -37,9 +37,6 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleListener;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -298,7 +295,7 @@ public class Digester extends DefaultHan
* The Log to which most logging calls will be made.
*/
protected Log log = LogFactory.getLog(Digester.class);
-protected StringManager sm = StringManager.getManager(Digester.class);
+protected static StringManager sm =
StringManager.getManager(Digester.class);
/**
* The Log to which all SAX event related logging calls will be made.
@@ -313,28 +310,23 @@ public class Digester extends DefaultHan
}
-public static class SystemPropertyReplacementListener
-implements LifecycleListener {
-protected Log log = LogFactory.getLog(Digester.class);
-protected StringManager sm = StringManager.getManager(Digester.class);
-@Override
-public void lifecycleEvent(LifecycleEvent event) {
-if (propertySource != null &&
Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
-IntrospectionUtils.PropertySource[] propertySources =
-new IntrospectionUtils.PropertySource[] {
propertySource };
-Properties properties = System.getProperties();
-Set names = properties.stringPropertyNames();
-for (String name : names) {
-String value = System.getProperty(name);
-if (value != null) {
-try {
-String newValue =
IntrospectionUtils.repl
svn commit: r1803136 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/util/SystemPropertyReplacerListener.java java/org/apache/tomcat/util/digester/Digester.java webapps/docs/config/listeners.x
Author: remm Date: Thu Jul 27 08:27:18 2017 New Revision: 1803136 URL: http://svn.apache.org/viewvc?rev=1803136&view=rev Log: Avoid circular dependency. Added: tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java - copied unchanged from r1803135, tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 27 08:27:18 2017 @@ -1 +1 @@ -/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,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,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,1747404,1747506,1747 536,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-1756289,1756408-1 756410,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-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,176276
Re: [VOTE] [OT] Release Apache Tomcat 8.5.19
On 26/07/2017 20:59, Christopher Schultz wrote: > Mark, > > On 7/26/17 2:34 PM, Mark Thomas wrote: >> On 25/07/2017 00:22, Mark Thomas wrote: >>> The proposed Apache Tomcat 8.5.19 release is now available for >>> voting. >>> >>> The major changes compared to the 8.5.16 release are: >>> >>> - Enable TLS connectors to use Java key stores that contain >>> multiple keys where each key has a separate password. Based on a >>> patch by Frank Taffelt. >>> >>> - Make asynchronous error handling more robust. In particular >>> ensure that onError() is called for any registered AsyncListeners >>> after an I/O error on a non-container thread. >>> >>> - Sync SSL session access for the APR connector to prevent errors >>> when accessing the session. >>> >>> >>> Along with lots of other bug fixes and improvements. >>> >>> >>> It can be obtained from: >>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.19/ >>> The Maven staging repo is: >>> https://repository.apache.org/content/repositories/orgapachetomcat-11 > 46/ >>> >>> > The svn tag is: >>> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_19/ >>> >>> >>> > The proposed 8.5.19 release is: >>> [ ] Broken - do not release [X] Stable - go ahead and release as >>> 8.5.19 > >> All unit tests passed with NIO, NIO2 and APR/native (1.2.12) on >> Linux Windows and macOS. > > I've noticed that there are some tests which have no bearing on the > type of connector, yet are run for each type of connector. For example > (from my test report): > > * org.apache.tomcat.util.net.openssl.ciphers.TestCipher.APR.txt > * org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt > * org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO2.txt > * > org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio > nParser.APR.txt > * > org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio > nParser.NIO.txt > * > org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio > nParser.NIO2.txt > > Would it be worth it to annotate some of these tests as being "not > connector-specific" and then running them only a single time? > Depending upon the number of them, it could significantly reduce the > time it takes to run all of the unit tests. I don't know. The tests that take longer to run tend to be the ones that involve I/O. Does JUnit provide a way for us to annotate the tests in this way? If it does we could have one test run for all the non-IO tests and per connector test runs for all the other tests. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.19
On Tue, Jul 25, 2017 at 1:22 AM, Mark Thomas wrote: > The proposed Apache Tomcat 8.5.19 release is now available for voting. > > The major changes compared to the 8.5.16 release are: > > - Enable TLS connectors to use Java key stores that contain multiple > keys where each key has a separate password. Based on a patch by Frank > Taffelt. > > - Make asynchronous error handling more robust. In particular ensure > that onError() is called for any registered AsyncListeners after an > I/O error on a non-container thread. > > - Sync SSL session access for the APR connector to prevent errors when > accessing the session. > > > Along with lots of other bug fixes and improvements. > > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.19/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1146/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_19/ > > The proposed 8.5.19 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.19 > > Rémy
Re: [VOTE] Release Apache Tomcat 9.0.0.M25
On Tue, Jul 25, 2017 at 1:19 AM, Mark Thomas wrote: > The proposed Apache Tomcat 9.0.0.M25 release is now available for voting. > > This is a milestone release for the 9.0.x branch. It should be > noted that, as a milestone release: > - Servlet 4.0 is not finalised > - The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0 > > Note that the 9.0.0.M23 and 9.0.0.M24 release votes were cancelled due > to regressions. > > The major changes compared to the 9.0.0.M22 release are: > > - Correct a regression in 9.0.0.M22 that prevented Tomcat from shutting > down cleanly. > > - Add LoadBalancerDrainingValve, a Valve designed to reduce the amount > of time required for a node to drain its authenticated users. > > - When generating JSP runtime error messages that quote the relevant JSP > source code, switch from using the results of the JSP page parsing > process to using the JSR 045 source map data to identify the correct > part of the JSP source from the stack trace. This significantly > reduces the memory footprint of Jasper in development mode, provides a > small performance improvement for error page generation and enables > source quotes to continue to be provided after a Tomcat restart. > > - Add support for a Tomcat specific deployment descriptor, > /WEB-INF/tomcat-web.xml > > - Add ExtractingRoot, a new WebResourceRoot implementation that extracts > JARs to the work directory for improved performance when deploying > packed WAR files. > > Along with lots of other bug fixes and improvements. > > > For full details, see the changelog: > http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M25/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1145/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M25/ > > The proposed 9.0.0.M25 release is: > [ ] Broken - do not release > [X] Alpha - go ahead and release as 9.0.0.M25 > > Rémy
Re: [VOTE] Release Apache Tomcat 8.5.19
On Tue, Jul 25, 2017 at 2:22 AM, Mark Thomas wrote: > The proposed Apache Tomcat 8.5.19 release is now available for voting. > > The major changes compared to the 8.5.16 release are: > > - Enable TLS connectors to use Java key stores that contain multiple > keys where each key has a separate password. Based on a patch by Frank > Taffelt. > > - Make asynchronous error handling more robust. In particular ensure > that onError() is called for any registered AsyncListeners after an > I/O error on a non-container thread. > > - Sync SSL session access for the APR connector to prevent errors when > accessing the session. > > > Along with lots of other bug fixes and improvements. > > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.19/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1146/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_19/ > > The proposed 8.5.19 release is: > [ ] Broken - do not release > [ X ] Stable - go ahead and release as 8.5.19 > > Regards, Martin > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] [OT] Release Apache Tomcat 8.5.19
Hi, On Thu, Jul 27, 2017 at 11:31 AM, Mark Thomas wrote: > On 26/07/2017 20:59, Christopher Schultz wrote: > > Mark, > > > > On 7/26/17 2:34 PM, Mark Thomas wrote: > >> On 25/07/2017 00:22, Mark Thomas wrote: > >>> The proposed Apache Tomcat 8.5.19 release is now available for > >>> voting. > >>> > >>> The major changes compared to the 8.5.16 release are: > >>> > >>> - Enable TLS connectors to use Java key stores that contain > >>> multiple keys where each key has a separate password. Based on a > >>> patch by Frank Taffelt. > >>> > >>> - Make asynchronous error handling more robust. In particular > >>> ensure that onError() is called for any registered AsyncListeners > >>> after an I/O error on a non-container thread. > >>> > >>> - Sync SSL session access for the APR connector to prevent errors > >>> when accessing the session. > >>> > >>> > >>> Along with lots of other bug fixes and improvements. > >>> > >>> > >>> It can be obtained from: > >>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.19/ > >>> The Maven staging repo is: > >>> https://repository.apache.org/content/repositories/orgapachetomcat-11 > > 46/ > >>> > >>> > > The svn tag is: > >>> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_19/ > >>> > >>> > >>> > > The proposed 8.5.19 release is: > >>> [ ] Broken - do not release [X] Stable - go ahead and release as > >>> 8.5.19 > > > >> All unit tests passed with NIO, NIO2 and APR/native (1.2.12) on > >> Linux Windows and macOS. > > > > I've noticed that there are some tests which have no bearing on the > > type of connector, yet are run for each type of connector. For example > > (from my test report): > > > > * org.apache.tomcat.util.net.openssl.ciphers.TestCipher.APR.txt > > * org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO.txt > > * org.apache.tomcat.util.net.openssl.ciphers.TestCipher.NIO2.txt > > * > > org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio > > nParser.APR.txt > > * > > org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio > > nParser.NIO.txt > > * > > org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfiguratio > > nParser.NIO2.txt > > > > Would it be worth it to annotate some of these tests as being "not > > connector-specific" and then running them only a single time? > > Depending upon the number of them, it could significantly reduce the > > time it takes to run all of the unit tests. > > I don't know. The tests that take longer to run tend to be the ones that > involve I/O. > > Does JUnit provide a way for us to annotate the tests in this way? If it > does we could have one test run for all the non-IO tests and per > connector test runs for all the other tests. > Here is how we do it in Wicket: - introduce a special annotation: https://github.com/apache/wicket/blob/d7e8fe2762700520a8856eda51f99eaa2678d002/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java - annotate slow tests with it: https://github.com/apache/wicket/blob/9e42a9548adb0da540e4e87d491f5824e778537e/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java#L32 - use Maven profile that skips slow tests and javadoc and sources generation: https://github.com/apache/wicket/blob/573fdf5739fb8a82223b54d551c343687b3aab35/pom.xml#L1166-L1193 usage: mvn clean install -Pfast It is not pure JUnit, but uses maven-surefire-plugin to control it, so I cannot tell you what exactly is the JUnit launcher configuration. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 61351] Non-US-ASCII letters in url-mapping
https://bz.apache.org/bugzilla/show_bug.cgi?id=61351 --- Comment #1 from Mark Thomas --- The requirement the URL patterns in web.xml must be decoded dates back to Servlet 2.3 (see r285186). In more recent times this has been tweaked so the the charset used to do the decoding is consistent with the charset used for the web.xml file (see r1758423). However, the expectation from the Java EE XSD is that: This pattern is assumed to be in URL-decoded form and must not contain CR(#xD) or LF(#xA) The Servlet specification also references RFC 3986 although it doesn't offer a view on where that RFC applies and where it does not. Those do not appear to be entirely consistent. Given the above, it is also worth noting the rare edge cases where a literal '*' or '%' needs to be used in the url-pattern. So, where to go from here? My current thinking is that Tomcat needs to assume the url-patterns may be partially decoded. i.e. they may contain characters not permitted by RFC 3986 and they may also contain %nn sequences that need to be decoded. Therefore, r1793440 needs to be reverted / rewritten on that basis. I'm going to start work in this direction but if folks disagree with my analysis or think I have missed one or more important points, please do speak up. -- 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: r1803165 - in /tomcat/trunk: build.xml java/org/apache/tomcat/util/net/LocalStrings.properties java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 27 11:55:30 2017
New Revision: 1803165
URL: http://svn.apache.org/viewvc?rev=1803165&view=rev
Log:
Add additional logging to record problems that occur while waiting for the NIO
pollers to stop during the Connector stop process.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1803165&r1=1803164&r2=1803165&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jul 27 11:55:30 2017
@@ -1590,6 +1590,7 @@
excludeFilter="res/findbugs/filter-false-positives.xml" >
+
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1803165&r1=1803164&r2=1803165&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Thu
Jul 27 11:55:30 2017
@@ -77,6 +77,8 @@ endpoint.apr.remoteport=APR socket [{0}]
endpoint.jsse.noSslContext=No SSLContext could be found for the host name [{0}]
endpoint.nio.registerFail=Failed to register socket with selector from poller
endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
+endpoint.nio.stopLatchAwaitFail=The pollers did not stop within the expected
time
+endpoint.nio.stopLatchAwaitInterrupted=This thread was interrupted while
waiting for the pollers to stop
endpoint.nio.timeoutCme=Exception during processing of timeouts. The code has
been checked repeatedly and no concurrent modification has been found. If you
are able to repeat this error please open a Tomcat bug and provide the steps to
reproduce.
endpoint.nio2.exclusiveExecutor=The NIO2 connector requires an exclusive
executor to operate properly on shutdown
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1803165&r1=1803164&r2=1803165&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Jul 27
11:55:30 2017
@@ -284,15 +284,17 @@ public class NioEndpoint extends Abstrac
pollers[i] = null;
}
try {
-getStopLatch().await(selectorTimeout + 100,
TimeUnit.MILLISECONDS);
-} catch (InterruptedException ignore) {
+if (!getStopLatch().await(selectorTimeout + 100,
TimeUnit.MILLISECONDS)) {
+log.warn(sm.getString("endpoint.nio.stopLatchAwaitFail"));
+}
+} catch (InterruptedException e) {
+
log.warn(sm.getString("endpoint.nio.stopLatchAwaitInterrupted"), e);
}
shutdownExecutor();
eventCache.clear();
nioChannels.clear();
processorCache.clear();
}
-
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1803165&r1=1803164&r2=1803165&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 27 11:55:30 2017
@@ -56,9 +56,13 @@
61345: Add a server listener that can be used to do system
- property replacement from the property source configured in the
- digester. (remm)
+property replacement from the property source configured in the
+digester. (remm)
+
+Add additional logging to record problems that occur while waiting for
+the NIO pollers to stop during the Connector stop process. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803167 - /tomcat/tc8.5.x/trunk/build.xml
Author: markt Date: Thu Jul 27 11:56:40 2017 New Revision: 1803167 URL: http://svn.apache.org/viewvc?rev=1803167&view=rev Log: Expand FindBugs on the command line to include the test code Modified: tomcat/tc8.5.x/trunk/build.xml Modified: tomcat/tc8.5.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1803167&r1=1803166&r2=1803167&view=diff == --- tomcat/tc8.5.x/trunk/build.xml (original) +++ tomcat/tc8.5.x/trunk/build.xml Thu Jul 27 11:56:40 2017 @@ -1590,6 +1590,7 @@ excludeFilter="res/findbugs/filter-false-positives.xml" > + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803168 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/LocalStrings.properties java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml
Author: markt Date: Thu Jul 27 11:57:17 2017 New Revision: 1803168 URL: http://svn.apache.org/viewvc?rev=1803168&view=rev Log: Add additional logging to record problems that occur while waiting for the NIO pollers to stop during the Connector stop process. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 27 11:57:17 2017 @@ -1 +1 @@ -/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,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,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,1747404,1747506,1747 536,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-1756289,1756408-1 756410,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-1762053,1762123,176216 8,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-17633
[Bug 61351] Non-US-ASCII letters in url-mapping
https://bz.apache.org/bugzilla/show_bug.cgi?id=61351
--- Comment #2 from Konstantin Kolinko ---
Interesting analysis.
A servlet-mapping can be created by a tool. E.g. JspC:
https://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?revision=1800816&view=markup#l1092
o.a.j.JspC.generateWebMapping()
Encoding of generated web.xml file is configurable ("-webxmlencoding" switch),
but the pattern itself is simply written as
> mappingout.write(file.replace('\\', '/'));
If we are to require that url-mapping pattern is urlencoded, JspC should be
adjusted for that.
--
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 61351] Non-US-ASCII letters in url-mapping
https://bz.apache.org/bugzilla/show_bug.cgi?id=61351 --- Comment #3 from Martin Nybo Andersen --- Hi Mark, If the 'pattern is assumed to be in URL-decoded form', why decode it again? Kind regards, Martin -- 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: r1803169 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/NioEndpoint.java java/org/apache/tomcat/util/net/res/LocalStrings.properties webapps/docs/changelog.xml
Author: markt Date: Thu Jul 27 12:04:07 2017 New Revision: 1803169 URL: http://svn.apache.org/viewvc?rev=1803169&view=rev Log: Add additional logging to record problems that occur while waiting for the NIO pollers to stop during the Connector stop process. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 27 12:04:07 2017 @@ -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,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,1802814 -/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139
Re: svn commit: r1803135 - in /tomcat/trunk: java/org/apache/catalina/util/SystemPropertyReplacerListener.java java/org/apache/tomcat/util/digester/Digester.java webapps/docs/config/listeners.xml weba
2017-07-27 11:25 GMT+03:00 :
> Author: remm
> Date: Thu Jul 27 08:25:46 2017
> New Revision: 1803135
>
> URL: http://svn.apache.org/viewvc?rev=1803135&view=rev
> Log:
> Avoid circular dependency.
>
> Added:
>
> tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
>(with props)
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
> tomcat/trunk/webapps/docs/config/listeners.xml
> tomcat/trunk/webapps/docs/config/systemprops.xml
>
> Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1803135&r1=1803134&r2=1803135&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Thu Jul
> 27 08:25:46 2017
> @@ -37,9 +37,6 @@ import javax.xml.parsers.ParserConfigura
> [...]
> +public static void replace() {
I do not like this method name. It is too generic.
And there is no way to customize its behaviour (no parameters).
> +Log log = LogFactory.getLog(Digester.class);
> +if (propertySource != null) {
> +IntrospectionUtils.PropertySource[] propertySources =
> +new IntrospectionUtils.PropertySource[] { propertySource
> };
> +Properties properties = System.getProperties();
> +Set names = properties.stringPropertyNames();
> +for (String name : names) {
> +String value = System.getProperty(name);
> +if (value != null) {
> +try {
> +String newValue =
> IntrospectionUtils.replaceProperties(value, null, propertySources);
> +if (value != newValue) {
> +System.setProperty(name, newValue);
> }
> +} catch (Exception e) {
> +
> log.warn(sm.getString("digester.failedToUpdateSystemProperty", name, value),
> e);
> }
> }
> }
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803174 - in /tomcat/trunk/java/org/apache: catalina/util/SystemPropertyReplacerListener.java tomcat/util/digester/Digester.java
Author: remm
Date: Thu Jul 27 12:35:05 2017
New Revision: 1803174
URL: http://svn.apache.org/viewvc?rev=1803174&view=rev
Log:
Rename method.
Modified:
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
Modified:
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java?rev=1803174&r1=1803173&r2=1803174&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
Thu Jul 27 12:35:05 2017
@@ -38,7 +38,7 @@ public class SystemPropertyReplacerListe
@Override
public void lifecycleEvent(LifecycleEvent event) {
if (Lifecycle.BEFORE_INIT_EVENT.equals(event.getType())) {
-Digester.replace();
+Digester.replaceSystemProperties();
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1803174&r1=1803173&r2=1803174&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Thu Jul 27
12:35:05 2017
@@ -310,7 +310,7 @@ public class Digester extends DefaultHan
}
-public static void replace() {
+public static void replaceSystemProperties() {
Log log = LogFactory.getLog(Digester.class);
if (propertySource != null) {
IntrospectionUtils.PropertySource[] propertySources =
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803175 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/util/SystemPropertyReplacerListener.java java/org/apache/tomcat/util/digester/Digester.java
Author: remm Date: Thu Jul 27 12:36:11 2017 New Revision: 1803175 URL: http://svn.apache.org/viewvc?rev=1803175&view=rev Log: Rename method. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 27 12:36:11 2017 @@ -1 +1 @@ -/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,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,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,1747404,1747506,1747 536,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-1756289,1756408-1 756410,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-1762053,1762123,176216 8,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,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1
svn commit: r1803182 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ java/org/apache/tomcat/websocket/
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 27 13:35:49 2017 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Util.java: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,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,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,1667 767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1672629,1694060 -/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240 046,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1 342027,1342029,1342315,1342320,1342476,1342498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-135164 0,1351991,1351993,1352011,1352056,1352059,1352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,136
svn commit: r1803182 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ java/org/apache/tomcat/websocket/
Author: remm Date: Thu Jul 27 13:35:49 2017 New Revision: 1803182 URL: http://svn.apache.org/viewvc?rev=1803182&view=rev Log: Fix bit sign checks warnings, no functional change Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/PerMessageDeflate.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java (contents, props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 27 13:35:49 2017 @@ -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,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,1802814 /tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,174
svn commit: r1803183 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml
Author: csutherl Date: Thu Jul 27 13:38:49 2017 New Revision: 1803183 URL: http://svn.apache.org/viewvc?rev=1803183&view=rev Log: Add EOL statements for all versions to whichversion. Thanks to peetaur2 from #tomcat for pointing out that EOL statements were missing for older versions. Modified: tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1803183&r1=1803182&r2=1803183&view=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Thu Jul 27 13:38:49 2017 @@ -601,6 +601,11 @@ it in production +Users of Tomcat 5 should be aware that Tomcat 5 has now reached +end of life. Users of Tomcat 5.x should +upgrade to Tomcat 6.x or later. + + Apache Tomcat 4.x @@ -653,6 +658,11 @@ also supports web applications built for specifications with no changes. +Users of Tomcat 4 should be aware that Tomcat 4 has now reached +end of life. Users of Tomcat 4.x should upgrade to Tomcat 5.x or +later. + + Apache Tomcat 3.x @@ -722,6 +732,11 @@ strongly encouraged to migrate to the cu Apache Tomcat 3.0.x. Initial Apache Tomcat release. +Users of Tomcat 3 should be aware that Tomcat 3 has now reached +end of life. Users of Tomcat 3.x should upgrade to Tomcat 4.x or +later. + + Modified: tomcat/site/trunk/xdocs/whichversion.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1803183&r1=1803182&r2=1803183&view=diff == --- tomcat/site/trunk/xdocs/whichversion.xml (original) +++ tomcat/site/trunk/xdocs/whichversion.xml Thu Jul 27 13:38:49 2017 @@ -299,6 +299,10 @@ it in production Expanded documentation +Users of Tomcat 5 should be aware that Tomcat 5 has now reached +end of life. Users of Tomcat 5.x should +upgrade to Tomcat 6.x or later. + @@ -333,6 +337,10 @@ performance. Version 4.0 implements the also supports web applications built for the Servlet 2.2 and JSP 1.1 specifications with no changes. +Users of Tomcat 4 should be aware that Tomcat 4 has now reached +end of life. Users of Tomcat 4.x should upgrade to Tomcat 5.x or +later. + @@ -385,6 +393,10 @@ strongly encouraged to migrate to the cu Apache Tomcat 3.0.x. Initial Apache Tomcat release. +Users of Tomcat 3 should be aware that Tomcat 3 has now reached +end of life. Users of Tomcat 3.x should upgrade to Tomcat 4.x or +later. + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.19
Am 25. Juli 2017 01:22:04 MESZ schrieb Mark Thomas : >The proposed Apache Tomcat 8.5.19 release is now available for voting. > >The major changes compared to the 8.5.16 release are: > >- Enable TLS connectors to use Java key stores that contain multiple > keys where each key has a separate password. Based on a patch by Frank > Taffelt. > >- Make asynchronous error handling more robust. In particular ensure > that onError() is called for any registered AsyncListeners after an > I/O error on a non-container thread. > >- Sync SSL session access for the APR connector to prevent errors when > accessing the session. > > >Along with lots of other bug fixes and improvements. > > >It can be obtained from: >https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.19/ >The Maven staging repo is: >https://repository.apache.org/content/repositories/orgapachetomcat-1146/ >The svn tag is: >http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_19/ > >The proposed 8.5.19 release is: >[ ] Broken - do not release >[x] Stable - go ahead and release as 8.5.19 Felix > >- >To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803193 - in /tomcat/trunk/java/org/apache: catalina/tribes/ catalina/tribes/tipis/ tomcat/util/buf/
Author: remm
Date: Thu Jul 27 15:15:52 2017
New Revision: 1803193
URL: http://svn.apache.org/viewvc?rev=1803193&view=rev
Log:
Fix some clone usage issues.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/ChannelMessage.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelMessage.java?rev=1803193&r1=1803192&r2=1803193&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelMessage.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelMessage.java Thu Jul 27
15:15:52 2017
@@ -26,7 +26,7 @@ import org.apache.catalina.tribes.io.XBy
* interceptor and eventually down to the ChannelSender component
*
*/
-public interface ChannelMessage extends Serializable {
+public interface ChannelMessage extends Serializable, Cloneable {
/**
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1803193&r1=1803192&r2=1803193&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Thu Jul 27 15:15:52 2017
@@ -1133,11 +1133,6 @@ public abstract class AbstractReplicated
return false;
}
-@Override
-public Object clone() {
-throw new
UnsupportedOperationException(sm.getString("abstractReplicatedMap.unsupport.operation"));
-}
-
/**
* Returns the entire contents of the map
* Map.Entry.getValue() will return a LazyReplicatedMap.MapEntry object
containing all the information
@@ -1376,7 +1371,7 @@ public abstract class AbstractReplicated
//map message to send to and from other maps
//--
-public static class MapMessage implements Serializable {
+public static class MapMessage implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
public static final int MSG_BACKUP = 1;
public static final int MSG_RETRIEVE_BACKUP = 2;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties?rev=1803193&r1=1803192&r2=1803193&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties
Thu Jul 27 15:15:52 2017
@@ -33,7 +33,6 @@ abstractReplicatedMap.unable.remove=Unab
abstractReplicatedMap.unable.retrieve=Unable to retrieve remote object for
key:[{0}]
abstractReplicatedMap.unable.get=Unable to replicate out data for a
AbstractReplicatedMap.get operation
abstractReplicatedMap.unable.put=Unable to replicate out data for a
AbstractReplicatedMap.put operation
-abstractReplicatedMap.unsupport.operation=This operation is not valid on a
replicated map
abstractReplicatedMap.mapMemberAdded.nullMember=Notified member is not
registered in the membership:[{0}].
abstractReplicatedMap.mapMemberAdded.added=Map member added:[{0}]
abstractReplicatedMap.leftOver.pingMsg=PING message has been received beyond
the timeout period. The map member[{0}] might have been removed from the map
membership.
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=1803193&r1=1803192&r2=1803193&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Thu Jul 27
15:15:52 2017
@@ -148,6 +148,11 @@ public final class ByteChunk implements
allocate( initial, -1 );
}
+@Override
+public Object clone() throws CloneNotSupportedException {
+return super.clone();
+}
+
public boolean isNull() {
return ! isSet; // buff==null;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apac
Re: [VOTE] Release Apache Tomcat 9.0.0.M25
Am 25. Juli 2017 01:19:20 MESZ schrieb Mark Thomas : >The proposed Apache Tomcat 9.0.0.M25 release is now available for >voting. > >This is a milestone release for the 9.0.x branch. It should be >noted that, as a milestone release: >- Servlet 4.0 is not finalised >- The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0 > >Note that the 9.0.0.M23 and 9.0.0.M24 release votes were cancelled due >to regressions. > >The major changes compared to the 9.0.0.M22 release are: > >- Correct a regression in 9.0.0.M22 that prevented Tomcat from shutting > down cleanly. > >- Add LoadBalancerDrainingValve, a Valve designed to reduce the amount > of time required for a node to drain its authenticated users. > >- When generating JSP runtime error messages that quote the relevant >JSP > source code, switch from using the results of the JSP page parsing > process to using the JSR 045 source map data to identify the correct > part of the JSP source from the stack trace. This significantly > reduces the memory footprint of Jasper in development mode, provides a > small performance improvement for error page generation and enables > source quotes to continue to be provided after a Tomcat restart. > >- Add support for a Tomcat specific deployment descriptor, > /WEB-INF/tomcat-web.xml > >- Add ExtractingRoot, a new WebResourceRoot implementation that >extracts > JARs to the work directory for improved performance when deploying > packed WAR files. > >Along with lots of other bug fixes and improvements. > > >For full details, see the changelog: >http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > >It can be obtained from: >https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M25/ >The Maven staging repo is: >https://repository.apache.org/content/repositories/orgapachetomcat-1145/ >The svn tag is: >http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M25/ > >The proposed 9.0.0.M25 release is: >[ ] Broken - do not release >[x] Alpha - go ahead and release as 9.0.0.M25 Felix > >- >To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803197 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/tribes/ java/org/apache/catalina/tribes/tipis/ java/org/apache/tomcat/util/buf/
Author: remm Date: Thu Jul 27 15:26:54 2017 New Revision: 1803197 URL: http://svn.apache.org/viewvc?rev=1803197&view=rev Log: Fix clone issues Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelMessage.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/LocalStrings.properties 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/java/org/apache/tomcat/util/buf/MessageBytes.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 27 15:26:54 2017 @@ -1 +1 @@ -/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,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,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,1747404,1747506,1747 536,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-1756289,1756408-1 756410,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-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762
svn commit: r1803201 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes: ChannelMessage.java tipis/AbstractReplicatedMap.java
Author: remm
Date: Thu Jul 27 15:30:25 2017
New Revision: 1803201
URL: http://svn.apache.org/viewvc?rev=1803201&view=rev
Log:
Fix clone issues
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/ChannelMessage.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/ChannelMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/ChannelMessage.java?rev=1803201&r1=1803200&r2=1803201&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/ChannelMessage.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/ChannelMessage.java
Thu Jul 27 15:30:25 2017
@@ -27,7 +27,7 @@ import org.apache.catalina.tribes.io.XBy
* @author Filip Hanik
*
*/
-public interface ChannelMessage extends Serializable {
+public interface ChannelMessage extends Serializable, Cloneable {
/**
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1803201&r1=1803200&r2=1803201&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Thu Jul 27 15:30:25 2017
@@ -1147,11 +1147,6 @@ public abstract class AbstractReplicated
return false;
}
-@Override
-public Object clone() {
-throw new UnsupportedOperationException("This operation is not valid
on a replicated map");
-}
-
/**
* Returns the entire contents of the map
* Map.Entry.getValue() will return a LazyReplicatedMap.MapEntry object
containing all the information
@@ -1396,7 +1391,7 @@ public abstract class AbstractReplicated
//map message to send to and from other maps
//--
-public static class MapMessage implements Serializable {
+public static class MapMessage implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
public static final int MSG_BACKUP = 1;
public static final int MSG_RETRIEVE_BACKUP = 2;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.0.M25
On Mon, Jul 24, 2017 at 7:19 PM, Mark Thomas wrote: > The proposed Apache Tomcat 9.0.0.M25 release is now available for voting. > > This is a milestone release for the 9.0.x branch. It should be > noted that, as a milestone release: > - Servlet 4.0 is not finalised > - The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0 > > Note that the 9.0.0.M23 and 9.0.0.M24 release votes were cancelled due > to regressions. > > The major changes compared to the 9.0.0.M22 release are: > > - Correct a regression in 9.0.0.M22 that prevented Tomcat from shutting > down cleanly. > > - Add LoadBalancerDrainingValve, a Valve designed to reduce the amount > of time required for a node to drain its authenticated users. > > - When generating JSP runtime error messages that quote the relevant JSP > source code, switch from using the results of the JSP page parsing > process to using the JSR 045 source map data to identify the correct > part of the JSP source from the stack trace. This significantly > reduces the memory footprint of Jasper in development mode, provides a > small performance improvement for error page generation and enables > source quotes to continue to be provided after a Tomcat restart. > > - Add support for a Tomcat specific deployment descriptor, > /WEB-INF/tomcat-web.xml > > - Add ExtractingRoot, a new WebResourceRoot implementation that extracts > JARs to the work directory for improved performance when deploying > packed WAR files. > > Along with lots of other bug fixes and improvements. > > > For full details, see the changelog: > http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M25/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1145/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M25/ > > The proposed 9.0.0.M25 release is: > [ ] Broken - do not release > [x] Alpha - go ahead and release as 9.0.0.M25 +1 > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803205 - in /tomcat/trunk/java/org/apache/tomcat/util: digester/Digester.java net/NioBlockingSelector.java
Author: remm
Date: Thu Jul 27 15:55:47 2017
New Revision: 1803205
URL: http://svn.apache.org/viewvc?rev=1803205&view=rev
Log:
Fix findbugs warnings.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1803205&r1=1803204&r2=1803205&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Thu Jul 27
15:55:47 2017
@@ -295,7 +295,7 @@ public class Digester extends DefaultHan
* The Log to which most logging calls will be made.
*/
protected Log log = LogFactory.getLog(Digester.class);
-protected static StringManager sm =
StringManager.getManager(Digester.class);
+protected static final StringManager sm =
StringManager.getManager(Digester.class);
/**
* The Log to which all SAX event related logging calls will be made.
@@ -322,7 +322,7 @@ public class Digester extends DefaultHan
if (value != null) {
try {
String newValue =
IntrospectionUtils.replaceProperties(value, null, propertySources);
-if (value != newValue) {
+if (!value.equals(newValue)) {
System.setProperty(name, newValue);
}
} catch (Exception e) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=1803205&r1=1803204&r2=1803205&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Thu
Jul 27 15:55:47 2017
@@ -450,7 +450,6 @@ public class NioBlockingSelector {
log.warn("Possible key leak, cancelling key in the
finalizer.");
try {key.cancel();}catch (Exception ignore){}
}
-key = null;
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803206 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/digester/Digester.java java/org/apache/tomcat/util/net/NioBlockingSelector.java
Author: remm Date: Thu Jul 27 15:57:06 2017 New Revision: 1803206 URL: http://svn.apache.org/viewvc?rev=1803206&view=rev Log: Fix findbugs warnings Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 27 15:57:06 2017 @@ -1 +1 @@ -/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,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,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,1747404,1747506,1747 536,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-1756289,1756408-1 756410,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-1762053,1762123,176216 8,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,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,176
[Bug 61351] Non-US-ASCII letters in url-mapping
https://bz.apache.org/bugzilla/show_bug.cgi?id=61351 --- Comment #4 from Mark Thomas --- The requirement the URL patterns in web.xml must be decoded dates back to Servlet 2.3 (see r285186). -- 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: r1803224 - in /tomcat/trunk: java/org/apache/tomcat/util/buf/LocalStrings.properties java/org/apache/tomcat/util/buf/UDecoder.java test/org/apache/tomcat/util/buf/TestUDecoder.java webapps
Author: markt
Date: Thu Jul 27 18:45:49 2017
New Revision: 1803224
URL: http://svn.apache.org/viewvc?rev=1803224&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61351
Correctly handle %nn decoding of URL patterns in web.xml and similar locations
that may legitimately contain characters that are not permitted by RFC 3986.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties?rev=1803224&r1=1803223&r2=1803224&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties Thu
Jul 27 18:45:49 2017
@@ -19,7 +19,8 @@ c2bConverter.recycleFailed=Failed to rec
hexUtils.fromHex.oddDigits=The input must consist of an even number of hex
digits
hexUtils.fromHex.nonHex=The input must consist only of hex digits
-uDecoder.urlDecode.missingDigit=The % character must be followed by two
hexademical digits
+uDecoder.urlDecode.conversionError=Failed to decode [{0}] using character set
[{1}]
+uDecoder.urlDecode.missingDigit=Failed to decode [{0}] because the % character
must be followed by two hexademical digits
uDecoder.convertHexDigit.notHex=[{0}] is not a hexadecimal digit
byteBufferUtils.cleaner=Cannot use direct ByteBuffer cleaner, memory leaking
may occur
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1803224&r1=1803223&r2=1803224&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Jul 27
18:45:49 2017
@@ -16,8 +16,10 @@
*/
package org.apache.tomcat.util.buf;
+import java.io.ByteArrayOutputStream;
import java.io.CharConversionException;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@@ -317,39 +319,68 @@ public final class UDecoder {
return null;
}
-byte[] bytes = str.getBytes(StandardCharsets.US_ASCII);
+int index = str.indexOf('%');
+if (index == -1) {
+// No %nn sequences, so return string unchanged
+return str;
+}
if (charset == null) {
charset = StandardCharsets.UTF_8;
}
-int len = bytes.length;
+/*
+ * Decoding is required.
+ *
+ * Potential complications:
+ * - The source String may be partially decoded so it is not valid to
+ * assume that the source String is ASCII.
+ * - Have to process as characters since there is no guarantee that the
+ * byte sequence for '%' is going to be the same in all character
+ * sets.
+ * - We don't know how many '%nn' sequences are required for a single
+ * character. It varies between character sets and some use a
variable
+ * length.
+ */
+
+// This isn't perfect but it is a reasonable guess for the size of the
+// array required
+ByteArrayOutputStream baos = new ByteArrayOutputStream(str.length() *
2);
+
+OutputStreamWriter osw = new OutputStreamWriter(baos, charset);
+
+char[] sourceChars = str.toCharArray();
+int len = sourceChars.length;
int ix = 0;
-int ox = 0;
-while (ix < len) {
-byte b = bytes[ix++]; // Get byte to test
-if (b == '%') {
-if (ix + 2 > len) {
-throw new IllegalArgumentException(
-sm.getString("uDecoder.urlDecode.missingDigit"));
+
+try {
+while (ix < len) {
+char c = sourceChars[ix++];
+if (c == '%') {
+osw.flush();
+if (ix + 2 > len) {
+throw new IllegalArgumentException(
+
sm.getString("uDecoder.urlDecode.missingDigit", str));
+}
+char c1 = sourceChars[ix++];
+char c2 = sourceChars[ix++];
+if (isHexDigit(c1) && isHexDigit(c2)) {
+baos.write(x2c(c1, c2));
+} else {
+throw new IllegalArgumentException(
+
sm.getString("uDecoder.urlDecode.missingDigit", s
svn commit: r1803225 - /tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Author: markt
Date: Thu Jul 27 18:57:15 2017
New Revision: 1803225
URL: http://svn.apache.org/viewvc?rev=1803225&view=rev
Log:
Minor optimisation
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1803225&r1=1803224&r2=1803225&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Jul 27
18:57:15 2017
@@ -319,8 +319,7 @@ public final class UDecoder {
return null;
}
-int index = str.indexOf('%');
-if (index == -1) {
+if (str.indexOf('%') == -1) {
// No %nn sequences, so return string unchanged
return str;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1803226 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/buf/LocalStrings.properties java/org/apache/tomcat/util/buf/UDecoder.java test/org/apache/tomcat/util/buf/TestUDecoder.j
Author: markt Date: Thu Jul 27 19:16:21 2017 New Revision: 1803226 URL: http://svn.apache.org/viewvc?rev=1803226&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61351 Correctly handle %nn decoding of URL patterns in web.xml and similar locations that may legitimately contain characters that are not permitted by RFC 3986. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/buf/TestUDecoder.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 27 19:16:21 2017 @@ -1 +1 @@ -/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,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,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,1747404,1747506,1747 536,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-1756289,1756408-1 756410,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-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,17
[Bug 61351] Non-US-ASCII letters in url-mapping
https://bz.apache.org/bugzilla/show_bug.cgi?id=61351 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #5 from Mark Thomas --- Thanks for the report. This has been fixed in trunk (for 9.0.0.M26) and 8.5.x (for 8.5.20 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
[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) 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-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 8 runs. The current state of this project is 'Failed', with reason 'Build Timed Out'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 60 mins Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Dexecute.test.nio2=true -Dtest.temp=output/test-tmp-NIO2 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dtest.accesslog=true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170728.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20170728/bin/openssl -Dexecute.test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dexecute.test.apr=false -Dexecute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170728-native-src.tar.gz -Dtest.repor ts=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170728-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump
Re: svn commit: r1803183 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml
Shouldn't we redirect the users of eol versions to a supported version instead of another eol version? Felix Am 27. Juli 2017 15:38:49 MESZ schrieb csuth...@apache.org: >Author: csutherl >Date: Thu Jul 27 13:38:49 2017 >New Revision: 1803183 > >URL: http://svn.apache.org/viewvc?rev=1803183&view=rev >Log: >Add EOL statements for all versions to whichversion. Thanks to peetaur2 >from #tomcat for pointing out that EOL statements were missing for >older versions. > >Modified: >tomcat/site/trunk/docs/whichversion.html >tomcat/site/trunk/xdocs/whichversion.xml > >Modified: tomcat/site/trunk/docs/whichversion.html >URL: >http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1803183&r1=1803182&r2=1803183&view=diff >== >--- tomcat/site/trunk/docs/whichversion.html (original) >+++ tomcat/site/trunk/docs/whichversion.html Thu Jul 27 13:38:49 2017 >@@ -601,6 +601,11 @@ it in production > > > >+Users of Tomcat 5 should be aware that Tomcat 5 has now reached >+end of life. Users of Tomcat 5.x >should >+upgrade to Tomcat 6.x or later. >+ >+ > > Apache Tomcat 4.x > >@@ -653,6 +658,11 @@ also supports web applications built for > specifications with no changes. > > >+Users of Tomcat 4 should be aware that Tomcat 4 has now reached >+end of life. Users of Tomcat 4.x should upgrade to Tomcat 5.x or >+later. >+ >+ > > Apache Tomcat 3.x > >@@ -722,6 +732,11 @@ strongly encouraged to migrate to the cu >Apache Tomcat 3.0.x. Initial Apache Tomcat >release. > > >+Users of Tomcat 3 should be aware that Tomcat 3 has now reached >+end of life. Users of Tomcat 3.x should upgrade to Tomcat 4.x or >+later. >+ >+ > > > > >Modified: tomcat/site/trunk/xdocs/whichversion.xml >URL: >http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1803183&r1=1803182&r2=1803183&view=diff >== >--- tomcat/site/trunk/xdocs/whichversion.xml (original) >+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Jul 27 13:38:49 2017 >@@ -299,6 +299,10 @@ it in production > Expanded documentation > > >+Users of Tomcat 5 should be aware that Tomcat 5 has now reached >+end of life. Users of Tomcat 5.x >should >+upgrade to Tomcat 6.x or later. >+ > > > >@@ -333,6 +337,10 @@ performance. Version 4.0 implements the > also supports web applications built for the Servlet 2.2 and JSP 1.1 > specifications with no changes. > >+Users of Tomcat 4 should be aware that Tomcat 4 has now reached >+end of life. Users of Tomcat 4.x should upgrade to Tomcat 5.x or >+later. >+ > > > >@@ -385,6 +393,10 @@ strongly encouraged to migrate to the cu > >Apache Tomcat 3.0.x. Initial Apache Tomcat >release. > >+Users of Tomcat 3 should be aware that Tomcat 3 has now reached >+end of life. Users of Tomcat 3.x should upgrade to Tomcat 4.x or >+later. >+ > > > > > > >- >To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >For additional commands, e-mail: dev-h...@tomcat.apache.org
