svn commit: r1837282 - in /tomcat/trunk/java/org/apache/catalina/manager: LocalStrings_ru.properties host/LocalStrings_ru.properties
Author: markt
Date: Thu Aug 2 08:56:49 2018
New Revision: 1837282
URL: http://svn.apache.org/viewvc?rev=1837282&view=rev
Log:
Fix line-endings
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
(contents, props changed)
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
(contents, props changed)
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties?rev=1837282&r1=1837281&r2=1837282&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
[UTF-8] Thu Aug 2 08:56:49 2018
@@ -1,138 +1,138 @@
-# 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.
-
-htmlManagerServlet.appsAvailable=Запущено
-htmlManagerServlet.appsName=Название
-htmlManagerServlet.appsPath=Путь
-htmlManagerServlet.appsReload=Перезагрузка
-htmlManagerServlet.appsUndeploy=Развернуть
-htmlManagerServlet.appsVersion=Версия
-htmlManagerServlet.appsExpire=Приостановить
-htmlManagerServlet.appsSessions=Cеанс
-htmlManagerServlet.appsStart=Старт
-htmlManagerServlet.appsStop=Стоп
-htmlManagerServlet.appsTasks=Команды
-htmlManagerServlet.appsTitle=Приложения
-htmlManagerServlet.noVersion=Не указано
-htmlManagerServlet.expire.explain=с бездействием ≥
-htmlManagerServlet.expire.unit=минут
-htmlManagerServlet.helpHtmlManager=Справочник интерфейса
-htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
-htmlManagerServlet.helpManager=Справочник менеджера приложений
-htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
-htmlManagerServlet.configTitle=Конфигурация
-htmlManagerServlet.configSslReloadTitle=Сохранить TLS конфигурацию файлов
-htmlManagerServlet.configSslHostName=Имя TLS хоста
-htmlManagerServlet.configReloadButton=Сохранить
-htmlManagerServlet.deployButton=Развернуть
-htmlManagerServlet.deployConfig=Расположение файла настроек XML:
-htmlManagerServlet.deployPath=Путь:
-htmlManagerServlet.deployServer=Развернуть серверный WAR файл
-htmlManagerServlet.deployTitle=Развернуть
-htmlManagerServlet.deployUpload=WAR файл для развертывания
-htmlManagerServlet.deployUploadFail=ОШИБКА - Ошибка при развертывании: [{0}]
-htmlManagerServlet.deployUploadFile=Выберите WAR файл для загрузки
-htmlManagerServlet.deployUploadInServerXml=ОШИБКА - War файл [{0}] не может
быть загружен eсли он задан в server.xml
-htmlManagerServlet.deployUploadNotWar=ОШИБКА - Загружаемый файл должен быть с
расширением .war
-htmlManagerServlet.deployUploadNoFile=ОШИБКА - Ошибка при загрузке файла.
Файла нет
-htmlManagerServlet.deployUploadWarExists=ОШИБКА - War файл [{0}] уже
существует на сервере
-htmlManagerServlet.deployVersion=Версия:
-htmlManagerServlet.deployWar=WAR или путь до директории:
-htmlManagerServlet.diagnosticsLeak=Убедитесь, что при остановке, перезагрузке
или развертывании веб-приложения оно вызвало утечку памяти
-htmlManagerServlet.diagnosticsLeakButton=Найти утечки памяти
-htmlManagerServlet.diagnosticsLeakWarning=Диагностика предоставит список всех
ошибок
-htmlManagerServlet.diagnosticsSsl=TLS диагностика конфигурации коннектора
-htmlManagerServlet.diagnosticsSslConnectorCipherButton=Шифр
-htmlManagerServlet.diagnosticsSslConnectorCipherText=Список виртуальных TLS
хостов и их шифры
-htmlManagerServlet.diagnosticsSslConnectorCertsButton=Сертификаты безопасности
-htmlManagerServlet.diagnosticsSslConnectorCertsText=Список виртуальных TLS
хостов и их сертификатов безопасности
-htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=Доверенные
сертификаты
-htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=Список виртуальных
TLS хостов и их доверенные сертификаты безопасности
-htmlManagerServlet.diagnosticsTitle=Диагностика
-htmlManagerServlet.findleaksList=\
- The following web applications were stopped (reloaded, undeployed), but
their\n\
- classes from previous runs are still loaded in memory, thus causing a
memory\n\
- leak (use a profiler to confirm):\n
-htmlManagerServ
svn commit: r1837283 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager: LocalStrings_ru.properties host/LocalStrings_ru.properties
Author: markt Date: Thu Aug 2 08:58:23 2018 New Revision: 1837283 URL: http://svn.apache.org/viewvc?rev=1837283&view=rev Log: Set eol-style Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties (props changed) Propchange: tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties -- svn:eol-style = native Propchange: tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837284 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings_ru.properties java/org/apache/catalina/manager/host/LocalStrings_ru.properties
Author: markt Date: Thu Aug 2 08:58:57 2018 New Revision: 1837284 URL: http://svn.apache.org/viewvc?rev=1837284&view=rev Log: Set eol-style Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 2 08:58:57 2018 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,18231
Re: JDK 11 Early Access build 22 & JDK 12 Early Access b02 are available.
Hi Mark, Your bug (JDK-8208642) has been closed as a duplicate of another issue : https://bugs.openjdk.java.net/browse/JDK-8207009 I will let you know when the fix get's into a build. Rgds,Rory On 01/08/2018 10:47, Rory O'Donnell wrote: Thanks Mark, I'll follow up and advise when it's moved into JBS Rgds,Rory On 01/08/2018 10:41, Mark Thomas wrote: Rory, I can confirm that there is a JDK bug here. The short version is that server initiated renegotiation of a TLSv1.2 connection fails if the Java client is configured to allow TLSv1.3 Details available under internal review ID : 9056398 As always, I'm happy to provide further details if required. Cheers, Mark On 31/07/18 15:19, Rory O'Donnell wrote: Hi Mark, Does the latest JDK 11 EA build 24 also fail ? If yes, could you log a bug as we are now in Rampdown Phase 2. Thanks,Rory On 31/07/2018 15:10, Mark Thomas wrote: On 17/07/18 12:26, Rory O'Donnell wrote: *JDK 12 Early Access Build 02 is available at **http://jdk.java.net/12/* I've just run the Tomcat 9 test suite with the JDK 12 EA4 build and I see a few TLS related failures: [concat] Testsuites with failed tests: [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt I haven't dug into why the tests are failing yet. I also saw some failures in the OpenSSL tests but those are expected due to the OpenSSL version I have installed locally. Mark - To unsubscribe, e-mail:dev-unsubscr...@tomcat.apache.org For additional commands, e-mail:dev-h...@tomcat.apache.org -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA, Dublin,Ireland -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA, Dublin,Ireland
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3487 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1837282 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JDK 11 Early Access build 22 & JDK 12 Early Access b02 are available.
On 02/08/18 10:06, Rory O'Donnell wrote: > Hi Mark, > > Your bug (JDK-8208642) has been closed as a duplicate of another issue : > > https://bugs.openjdk.java.net/browse/JDK-8207009 > > I will let you know when the fix get's into a build. Thanks Rory. I should be able to build jdk11 from source and test the proposed patch. I'll let you know how I get on. Mark > > Rgds,Rory > > > On 01/08/2018 10:47, Rory O'Donnell wrote: >> >> Thanks Mark, I'll follow up and advise when it's moved into JBS >> >> Rgds,Rory >> >> >> On 01/08/2018 10:41, Mark Thomas wrote: >>> Rory, >>> >>> I can confirm that there is a JDK bug here. >>> >>> The short version is that server initiated renegotiation of a TLSv1.2 >>> connection fails if the Java client is configured to allow TLSv1.3 >>> >>> Details available under internal review ID : 9056398 >>> >>> As always, I'm happy to provide further details if required. >>> >>> Cheers, >>> >>> Mark >>> >>> >>> On 31/07/18 15:19, Rory O'Donnell wrote: Hi Mark, Does the latest JDK 11 EA build 24 also fail ? If yes, could you log a bug as we are now in Rampdown Phase 2. Thanks,Rory On 31/07/2018 15:10, Mark Thomas wrote: > On 17/07/18 12:26, Rory O'Donnell wrote: > > > >> *JDK 12 Early Access Build 02 is available at >> **http://jdk.java.net/12/* > I've just run the Tomcat 9 test suite with the JDK 12 EA4 build and I > see a few TLS related failures: > > [concat] Testsuites with failed tests: > [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt > [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt > [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt > [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt > > I haven't dug into why the tests are failing yet. > > I also saw some failures in the OpenSSL tests but those are > expected due > to the OpenSSL version I have installed locally. > > Mark > > - > To unsubscribe, e-mail:dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail:dev-h...@tomcat.apache.org > >> >> -- >> Rgds,Rory O'Donnell >> Quality Engineering Manager >> Oracle EMEA, Dublin,Ireland > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837285 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership: StaticMembershipService.java StaticMembershipServiceMBean.java
Author: kfujino
Date: Thu Aug 2 09:36:07 2018
New Revision: 1837285
URL: http://svn.apache.org/viewvc?rev=1837285&view=rev
Log:
Add JMX support for StaticMembershipService.
Added:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipServiceMBean.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java?rev=1837285&r1=1837284&r2=1837285&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipService.java
Thu Aug 2 09:36:07 2018
@@ -21,13 +21,18 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Properties;
+import javax.management.ObjectName;
+
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipProvider;
+import org.apache.catalina.tribes.jmx.JmxRegistry;
import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-public class StaticMembershipService extends MembershipServiceBase {
+public class StaticMembershipService extends MembershipServiceBase
+implements StaticMembershipServiceMBean {
+
private static final Log log =
LogFactory.getLog(StaticMembershipService.class);
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
@@ -35,6 +40,11 @@ public class StaticMembershipService ext
private StaticMember localMember;
private StaticMembershipProvider provider;
+/**
+ * the ObjectName of this McastService.
+ */
+private ObjectName oname = null;
+
public StaticMembershipService() {
//default values
setDefaults(this.properties);
@@ -53,7 +63,10 @@ public class StaticMembershipService ext
provider = buildMembershipProvider();
}
provider.start(level);
-// TODO JMX register
+JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
+if (jmxRegistry != null) {
+this.oname = jmxRegistry.registerJmx(",component=Membership",
this);
+}
}
protected StaticMembershipProvider buildMembershipProvider() throws
Exception {
@@ -71,7 +84,10 @@ public class StaticMembershipService ext
public void stop(int level) {
try {
if (provider != null && provider.stop(level)) {
-// TODO JMX unregister
+if (oname != null) {
+JmxRegistry.getRegistry(channel).unregisterJmx(oname);
+oname = null;
+}
provider = null;
channel = null;
}
@@ -134,24 +150,27 @@ public class StaticMembershipService ext
localMember.setLocal(true);
}
- public long getExpirationTime() {
- String expirationTime = properties.getProperty("expirationTime");
- return Long.parseLong(expirationTime);
- }
+@Override
+public long getExpirationTime() {
+String expirationTime = properties.getProperty("expirationTime");
+return Long.parseLong(expirationTime);
+}
public void setExpirationTime(long expirationTime) {
properties.setProperty("expirationTime",
String.valueOf(expirationTime));
}
- public int getConnectTimeout() {
- String connectTimeout = properties.getProperty("connectTimeout");
- return Integer.parseInt(connectTimeout);
- }
+@Override
+public int getConnectTimeout() {
+String connectTimeout = properties.getProperty("connectTimeout");
+return Integer.parseInt(connectTimeout);
+}
public void setConnectTimeout(int connectTimeout) {
properties.setProperty("connectTimeout",
String.valueOf(connectTimeout));
}
+@Override
public long getRpcTimeout() {
String rpcTimeout = properties.getProperty("rpcTimeout");
return Long.parseLong(rpcTimeout);
@@ -161,6 +180,7 @@ public class StaticMembershipService ext
properties.setProperty("rpcTimeout", String.valueOf(rpcTimeout));
}
+@Override
public boolean getUseThread() {
String useThread = properties.getProperty("useThread");
return Boolean.parseBoolean(useThread);
@@ -170,6 +190,7 @@ public class StaticMembershipService ext
properties.setProperty("useThread", String.valueOf(useThread));
}
+@Override
public long getPingInterval() {
String pingInterval = properties.getProperty("pingInterval");
return Long.parseLong(pingInterval);
Added:
tomcat/trunk/java/o
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3488 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1837285 Blamelist: kfujino Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JDK 11 Early Access build 22 & JDK 12 Early Access b02 are available.
That would be very useful, thanks. Rgds,Rory On 02/08/2018 10:31, Mark Thomas wrote: On 02/08/18 10:06, Rory O'Donnell wrote: Hi Mark, Your bug (JDK-8208642) has been closed as a duplicate of another issue : https://bugs.openjdk.java.net/browse/JDK-8207009 I will let you know when the fix get's into a build. Thanks Rory. I should be able to build jdk11 from source and test the proposed patch. I'll let you know how I get on. Mark Rgds,Rory On 01/08/2018 10:47, Rory O'Donnell wrote: Thanks Mark, I'll follow up and advise when it's moved into JBS Rgds,Rory On 01/08/2018 10:41, Mark Thomas wrote: Rory, I can confirm that there is a JDK bug here. The short version is that server initiated renegotiation of a TLSv1.2 connection fails if the Java client is configured to allow TLSv1.3 Details available under internal review ID : 9056398 As always, I'm happy to provide further details if required. Cheers, Mark On 31/07/18 15:19, Rory O'Donnell wrote: Hi Mark, Does the latest JDK 11 EA build 24 also fail ? If yes, could you log a bug as we are now in Rampdown Phase 2. Thanks,Rory On 31/07/2018 15:10, Mark Thomas wrote: On 17/07/18 12:26, Rory O'Donnell wrote: *JDK 12 Early Access Build 02 is available at **http://jdk.java.net/12/* I've just run the Tomcat 9 test suite with the JDK 12 EA4 build and I see a few TLS related failures: [concat] Testsuites with failed tests: [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt I haven't dug into why the tests are failing yet. I also saw some failures in the OpenSSL tests but those are expected due to the OpenSSL version I have installed locally. Mark - To unsubscribe, e-mail:dev-unsubscr...@tomcat.apache.org For additional commands, e-mail:dev-h...@tomcat.apache.org -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA, Dublin,Ireland -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA, Dublin,Ireland - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request #117: Enhance the CATALINA_BASE documentation
GitHub user m-czernek opened a pull request: https://github.com/apache/tomcat/pull/117 Enhance the CATALINA_BASE documentation As per the mailing list discussion, we'd like to enhance the catalina.home and catalina.base documentation so that it is present in the main html documentation, and not only in RUNNING.txt and various script files. Feel free to request corrections or further changes. What do you think? You can merge this pull request into a Git repository by running: $ git pull https://github.com/m-czernek/tomcat catalina_base Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat/pull/117.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #117 commit 151997326bb2b5f9678cf2c7cfc2fcbb78f6609c Author: Marek Czernek Date: 2018-08-02T13:08:56Z Enhance the CATALINA_BASE documentation --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JDK 11 Early Access build 22 & JDK 12 Early Access b02 are available.
On 02/08/18 13:42, Rory O'Donnell wrote: > That would be very useful, thanks. Rory, I have testing this locally and the proposed patch for JDK-8207009 *does not* address the issue described in JDK-8208642. I was concerned that I wasn't building the JDK correctly and/or picking up the wrong JDK but I've added a bunch of System.out.println() statements that confirm I am running the correct (current source plus JDK-8207009 patch) and that the failure described in JDK-8208642 is still happening in the same way. Mark > > Rgds,Rory > > > On 02/08/2018 10:31, Mark Thomas wrote: >> On 02/08/18 10:06, Rory O'Donnell wrote: >>> Hi Mark, >>> >>> Your bug (JDK-8208642) has been closed as a duplicate of another issue : >>> >>> https://bugs.openjdk.java.net/browse/JDK-8207009 >>> >>> I will let you know when the fix get's into a build. >> Thanks Rory. >> >> I should be able to build jdk11 from source and test the proposed patch. >> I'll let you know how I get on. >> >> Mark >> >> >>> Rgds,Rory >>> >>> >>> On 01/08/2018 10:47, Rory O'Donnell wrote: Thanks Mark, I'll follow up and advise when it's moved into JBS Rgds,Rory On 01/08/2018 10:41, Mark Thomas wrote: > Rory, > > I can confirm that there is a JDK bug here. > > The short version is that server initiated renegotiation of a TLSv1.2 > connection fails if the Java client is configured to allow TLSv1.3 > > Details available under internal review ID : 9056398 > > As always, I'm happy to provide further details if required. > > Cheers, > > Mark > > > On 31/07/18 15:19, Rory O'Donnell wrote: >> Hi Mark, >> >> Does the latest JDK 11 EA build 24 also fail ? If yes, could you >> log a >> bug as we are now >> >> in Rampdown Phase 2. >> >> Thanks,Rory >> >> >> On 31/07/2018 15:10, Mark Thomas wrote: >>> On 17/07/18 12:26, Rory O'Donnell wrote: >>> >>> >>> *JDK 12 Early Access Build 02 is available at **http://jdk.java.net/12/* >>> I've just run the Tomcat 9 test suite with the JDK 12 EA4 build >>> and I >>> see a few TLS related failures: >>> >>> [concat] Testsuites with failed tests: >>> [concat] >>> TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt >>> [concat] >>> TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt >>> [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt >>> [concat] >>> TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt >>> >>> I haven't dug into why the tests are failing yet. >>> >>> I also saw some failures in the OpenSSL tests but those are >>> expected due >>> to the OpenSSL version I have installed locally. >>> >>> Mark >>> >>> - >>> >>> To unsubscribe, e-mail:dev-unsubscr...@tomcat.apache.org >>> For additional commands, e-mail:dev-h...@tomcat.apache.org >>> -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA, Dublin,Ireland > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837300 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/catalina/cor
Author: markt
Date: Thu Aug 2 13:52:55 2018
New Revision: 1837300
URL: http://svn.apache.org/viewvc?rev=1837300&view=rev
Log:
Correctly decode URL paths. '+' should not be decoded to ' ' in the path
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1837300&r1=1837299&r2=1837300&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu Aug
2 13:52:55 2018
@@ -17,11 +17,9 @@
package org.apache.catalina.core;
import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
@@ -75,6 +73,7 @@ import org.apache.catalina.util.URLEncod
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
+import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.descriptor.web.FilterDef;
import org.apache.tomcat.util.http.RequestUtil;
import org.apache.tomcat.util.res.StringManager;
@@ -425,13 +424,7 @@ public class ApplicationContext implemen
if (getContext().getDispatchersUseEncodedPaths()) {
// Decode
-String decodedPath;
-try {
-decodedPath = URLDecoder.decode(normalizedPath, "UTF-8");
-} catch (UnsupportedEncodingException e) {
-// Impossible
-return null;
-}
+String decodedPath = UDecoder.URLDecode(normalizedPath);
// Security check to catch attempts to encode /../ sequences
normalizedPath = RequestUtil.normalize(decodedPath);
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1837300&r1=1837299&r2=1837300&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Thu Aug 2
13:52:55 2018
@@ -22,11 +22,9 @@ import java.beans.PropertyChangeSupport;
import java.io.File;
import java.io.FilePermission;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.lang.reflect.Constructor;
import java.net.URL;
import java.net.URLClassLoader;
-import java.net.URLDecoder;
import javax.management.ObjectName;
import javax.servlet.ServletContext;
@@ -41,6 +39,7 @@ import org.apache.catalina.util.ToString
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
@@ -602,9 +601,9 @@ public class WebappLoader extends Lifecy
for (int i = 0; i < repositories.length; i++) {
String repository = repositories[i].toString();
if (repository.startsWith("file://"))
-repository = utf8Decode(repository.substring(7));
+repository =
UDecoder.URLDecode(repository.substring(7));
else if (repository.startsWith("file:"))
-repository = utf8Decode(repository.substring(5));
+repository =
UDecoder.URLDecode(repository.substring(5));
else
continue;
if (repository == null)
@@ -631,16 +630,6 @@ public class WebappLoader extends Lifecy
return true;
}
-private String utf8Decode(String input) {
-String result = null;
-try {
-result = URLDecoder.decode(input, "UTF-8");
-} catch (UnsupportedEncodingException uee) {
-// Impossible. All JVMs are required to support UTF-8.
-}
-return result;
-}
-
private static final Log log = LogFactory.getLog(WebappLoader.class);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntim
svn commit: r1837301 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/c
Author: markt Date: Thu Aug 2 13:57:12 2018 New Revision: 1837301 URL: http://svn.apache.org/viewvc?rev=1837301&view=rev Log: Correctly decode URL paths. '+' should not be decoded to ' ' in the path Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappLoader.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java tomcat/tc8.5.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 2 13:57:12 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,17
svn commit: r1837312 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Author: markt
Date: Thu Aug 2 14:21:49 2018
New Revision: 1837312
URL: http://svn.apache.org/viewvc?rev=1837312&view=rev
Log:
Clean-up (Javadoc, ws, unnecessary code) to align with 9.0.x to make back-ports
simpler.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1837312&r1=1837311&r2=1837312&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Aug
2 14:21:49 2018
@@ -71,7 +71,11 @@ public final class UDecoder {
convert(mb, true);
}
-/** URLDecode, will modify the source.
+/**
+ * URLDecode, will modify the source.
+ * @param mb The URL encoded bytes
+ * @param query true if this is a query string
+ * @throws IOException Invalid %xx URL encoding
*/
public void convert( ByteChunk mb, boolean query )
throws IOException
@@ -122,8 +126,6 @@ public final class UDecoder {
}
mb.setEnd( idx );
-
-return;
}
// Additional methods
@@ -140,7 +142,11 @@ public final class UDecoder {
convert(mb, true);
}
-/** In-buffer processing - the buffer will be modified
+/**
+ * In-buffer processing - the buffer will be modified.
+ * @param mb The URL encoded chars
+ * @param query true if this is a query string
+ * @throws IOException Invalid %xx URL encoding
*/
public void convert( CharChunk mb, boolean query )
throws IOException
@@ -205,7 +211,11 @@ public final class UDecoder {
convert(mb, true);
}
-/** URLDecode, will modify the source
+/**
+ * URLDecode, will modify the source
+ * @param mb The URL encoded String, bytes or chars
+ * @param query true if this is a query string
+ * @throws IOException Invalid %xx URL encoding
*/
public void convert(MessageBytes mb, boolean query)
throws IOException
@@ -245,6 +255,12 @@ public final class UDecoder {
return convert(str, true);
}
+/**
+ * %xx decoding of a string. FIXME: this is inefficient.
+ * @param str The URL encoded string
+ * @param query true if this is a query string
+ * @return the decoded string
+ */
public final String convert(String str, boolean query)
{
if (str == null) {
@@ -315,6 +331,7 @@ public final class UDecoder {
( c>='A' && c<='F' ));
}
+
private static int x2c( byte b1, byte b2 ) {
int digit= (b1>='A') ? ( (b1 & 0xDF)-'A') + 10 :
(b1 -'0');
@@ -324,6 +341,7 @@ public final class UDecoder {
return digit;
}
+
private static int x2c( char b1, char b2 ) {
int digit= (b1>='A') ? ( (b1 & 0xDF)-'A') + 10 :
(b1 -'0');
@@ -332,5 +350,4 @@ public final class UDecoder {
(b2 -'0');
return digit;
}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837319 - in /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf: LocalStrings.properties UDecoder.java
Author: markt
Date: Thu Aug 2 14:26:40 2018
New Revision: 1837319
URL: http://svn.apache.org/viewvc?rev=1837319&view=rev
Log:
Back-port static URL decode methods.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties?rev=1837319&r1=1837318&r2=1837319&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
Thu Aug 2 14:26:40 2018
@@ -15,3 +15,7 @@
b2cConverter.unknownEncoding=The character encoding [{0}] is not supported
c2bConverter.recycleFailed=Failed to recycle the C2B Converter. Creating new
BufferedWriter, WriteConvertor and IntermediateOutputStream.
+
+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
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1837319&r1=1837318&r2=1837319&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Aug
2 14:26:40 2018
@@ -16,8 +16,13 @@
*/
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 org.apache.tomcat.util.res.StringManager;
/**
* All URL decoding happens here. This way we can reuse, review, optimize
@@ -29,6 +34,8 @@ import java.io.IOException;
*/
public final class UDecoder {
+private static final StringManager sm =
StringManager.getManager(UDecoder.class);
+
public static final boolean ALLOW_ENCODED_SLASH =
Boolean.parseBoolean(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH",
"false"));
@@ -324,6 +331,100 @@ public final class UDecoder {
}
+/**
+ * Decode and return the specified URL-encoded String.
+ * When the byte array is converted to a string, UTF-8 is used. This may
+ * be different than some other servers. It is assumed the string is not a
+ * query string.
+ *
+ * @param str The url-encoded string
+ * @return the decoded string
+ * @exception IllegalArgumentException if a '%' character is not followed
+ * by a valid 2-digit hexadecimal number
+ */
+public static String URLDecode(String str) {
+return URLDecode(str, B2CConverter.UTF_8);
+}
+
+
+/**
+ * Decode and return the specified URL-encoded String. It is assumed the
+ * string is not a query string.
+ *
+ * @param str The url-encoded string
+ * @param charset The character encoding to use; if null, UTF-8 is used.
+ * @return the decoded string
+ * @exception IllegalArgumentException if a '%' character is not followed
+ * by a valid 2-digit hexadecimal number
+ */
+public static String URLDecode(String str, Charset charset) {
+if (str == null) {
+return null;
+}
+
+if (str.indexOf('%') == -1) {
+// No %nn sequences, so return string unchanged
+return str;
+}
+
+if (charset == null) {
+charset = B2CConverter.UTF_8;
+}
+
+/*
+ * 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;
+
+
svn commit: r1837320 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ test/org/apache/catalina/core/ webapps/docs/
Author: markt Date: Thu Aug 2 14:30:08 2018 New Revision: 1837320 URL: http://svn.apache.org/viewvc?rev=1837320&view=rev Log: Correctly decode URL paths. '+' should not be decoded to ' ' in the path Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcher.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 2 14:30:08 2018 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,181
svn commit: r1837333 - /tomcat/jk/trunk/native/
Author: markt Date: Thu Aug 2 18:50:22 2018 New Revision: 1837333 URL: http://svn.apache.org/viewvc?rev=1837333&view=rev Log: Ignore generated build system cache Modified: tomcat/jk/trunk/native/ (props changed) Propchange: tomcat/jk/trunk/native/ -- --- svn:ignore (original) +++ svn:ignore Thu Aug 2 18:50:22 2018 @@ -8,3 +8,4 @@ libtool config.status build.properties config.nice +autom4te.cache - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 31 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 27 mins 41 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180803/bin/openssl -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/wor
svn commit: r1837346 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
Author: kfujino
Date: Fri Aug 3 05:45:25 2018
New Revision: 1837346
URL: http://svn.apache.org/viewvc?rev=1837346&view=rev
Log:
The event notification of memberAdded or memberDisappeared does not prevent
execution of the original thread such as ping, receiver thread.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java?rev=1837346&r1=1837345&r2=1837346&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
Fri Aug 3 05:45:25 2018
@@ -25,6 +25,8 @@ import java.nio.charset.StandardCharsets
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
@@ -37,6 +39,7 @@ import org.apache.catalina.tribes.group.
import org.apache.catalina.tribes.group.RpcCallback;
import org.apache.catalina.tribes.group.RpcChannel;
import org.apache.catalina.tribes.util.Arrays;
+import org.apache.catalina.tribes.util.ExecutorFactory;
import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -62,6 +65,8 @@ public class StaticMembershipProvider ex
protected long pingInterval = 1000;
protected volatile boolean running = true;
protected PingThread thread = null;
+// The event notification executor
+protected final ExecutorService executor =
ExecutorFactory.newThreadPool(0, 10, 10, TimeUnit.SECONDS);
@Override
public void init(Properties properties) throws Exception {
@@ -113,6 +118,7 @@ public class StaticMembershipProvider ex
}
startLevel = (startLevel & (~level));
if ( startLevel == 0 ) {
+executor.shutdownNow();
running = false;
if (thread != null) {
thread.interrupt();
@@ -155,15 +161,35 @@ public class StaticMembershipProvider ex
protected void memberAdded(Member member) {
Member mbr = setupMember(member);
if(membership.memberAlive(mbr)) {
-// TODO invoke thread
-membershipListener.memberAdded(mbr);
+Runnable r = new Runnable() {
+public void run(){
+String name = Thread.currentThread().getName();
+try {
+
Thread.currentThread().setName("StaticMembership-memberAdded");
+membershipListener.memberAdded(mbr);
+} finally {
+Thread.currentThread().setName(name);
+}
+}
+};
+executor.execute(r);
}
}
protected void memberDisappeared(Member member) {
membership.removeMember(member);
-// TODO invoke thread
-membershipListener.memberDisappeared(member);
+Runnable r = new Runnable() {
+public void run(){
+String name = Thread.currentThread().getName();
+try {
+
Thread.currentThread().setName("StaticMembership-memberDisappeared");
+membershipListener.memberDisappeared(member);
+} finally {
+Thread.currentThread().setName(name);
+}
+}
+};
+executor.execute(r);
}
protected void memberAlive(Member member) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
