svn commit: r1852677 - in /tomcat/trunk/java/org/apache/tomcat/websocket/pojo: LocalStrings.properties PojoMethodMapping.java
Author: remm
Date: Fri Feb 1 08:42:36 2019
New Revision: 1852677
URL: http://svn.apache.org/viewvc?rev=1852677&view=rev
Log:
i18n
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties?rev=1852677&r1=1852676&r2=1852677&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
[UTF-8] Fri Feb 1 08:42:36 2019
@@ -32,6 +32,7 @@ pojoMethodMapping.duplicatePongMessagePa
pojoMethodMapping.duplicateSessionParam=Multiple session parameters present on
the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMethodMapping.invalidDecoder=The specified decoder of type [{0}] could not
be instantiated
pojoMethodMapping.methodNotPublic=The annotated method [{0}] is not public
+pojoMethodMapping.noDecoder=No decoder was found for message parameters
present on the method [{0}] of class [{1}] that was annotated with OnMessage
pojoMethodMapping.noPayload=No payload parameter present on the method [{0}]
of class [{1}] that was annotated with OnMessage
pojoMethodMapping.onErrorNoThrowable=No Throwable parameter was present on the
method [{0}] of class [{1}] that was annotated with OnError
pojoMethodMapping.paramWithoutAnnotation=A parameter of type [{0}] was found
on method[{1}] of class [{2}] that did not have a @PathParam annotation
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1852677&r1=1852676&r2=1852677&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Fri Feb 1 08:42:36 2019
@@ -485,7 +485,9 @@ public class PojoMethodMapping {
if (decoderMatch.hasMatches()) {
indexPayload = i;
} else {
-throw new DeploymentException("Boo!");
+throw new DeploymentException(sm.getString(
+"pojoMethodMapping.noDecoder",
+m.getName(), m.getDeclaringClass().getName()));
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852678 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/mbeans/ java/org/apache/tomcat/websocket/pojo/
Author: remm Date: Fri Feb 1 08:44:00 2019 New Revision: 1852678 URL: http://svn.apache.org/viewvc?rev=1852678&view=rev Log: i18n Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 08:44:00 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,176317
svn commit: r1852679 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans: JmxRemoteLifecycleListener.java LocalStrings.properties
Author: remm
Date: Fri Feb 1 08:46:13 2019
New Revision: 1852679
URL: http://svn.apache.org/viewvc?rev=1852679&view=rev
Log:
Fix unintended commit
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=1852679&r1=1852678&r2=1852679&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
Fri Feb 1 08:46:13 2019
@@ -31,8 +31,11 @@ import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.rmi.server.RMIClientSocketFactory;
import java.rmi.server.RMIServerSocketFactory;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
+import java.util.Locale;
import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXServiceURL;
@@ -41,7 +44,6 @@ import javax.management.remote.rmi.RMIJR
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSessionContext;
import javax.rmi.ssl.SslRMIClientSocketFactory;
import javax.rmi.ssl.SslRMIServerSocketFactory;
@@ -50,9 +52,6 @@ import org.apache.catalina.LifecycleEven
import org.apache.catalina.LifecycleListener;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.net.SSLHostConfig;
-import org.apache.tomcat.util.net.SSLHostConfigCertificate;
-import org.apache.tomcat.util.net.jsse.JSSEUtil;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -62,9 +61,7 @@ import org.apache.tomcat.util.res.String
* the listener. The remainder of the configuration is via the standard system
* properties for configuring JMX.
*/
-public class JmxRemoteLifecycleListener extends SSLHostConfig implements
LifecycleListener {
-
-private static final long serialVersionUID = 1L;
+public class JmxRemoteLifecycleListener implements LifecycleListener {
private static final Log log =
LogFactory.getLog(JmxRemoteLifecycleListener.class);
@@ -76,6 +73,9 @@ public class JmxRemoteLifecycleListener
protected int rmiServerPortPlatform = -1;
protected boolean rmiRegistrySSL = true;
protected boolean rmiServerSSL = true;
+protected String ciphers[] = null;
+protected String protocols[] = null;
+protected boolean clientAuth = true;
protected boolean authenticate = true;
protected String passwordFile = null;
protected String loginModuleName = null;
@@ -155,138 +155,48 @@ public class JmxRemoteLifecycleListener
this.useLocalPorts = useLocalPorts;
}
-/**
- * @return the rmiRegistrySSL
- */
-public boolean isRmiRegistrySSL() {
-return rmiRegistrySSL;
-}
-
-/**
- * @param rmiRegistrySSL the rmiRegistrySSL to set
- */
-public void setRmiRegistrySSL(boolean rmiRegistrySSL) {
-this.rmiRegistrySSL = rmiRegistrySSL;
-}
-
-/**
- * @return the rmiServerSSL
- */
-public boolean isRmiServerSSL() {
-return rmiServerSSL;
-}
-
-/**
- * @param rmiServerSSL the rmiServerSSL to set
- */
-public void setRmiServerSSL(boolean rmiServerSSL) {
-this.rmiServerSSL = rmiServerSSL;
-}
-
-/**
- * @return the authenticate
- */
-public boolean isAuthenticate() {
-return authenticate;
-}
-
-/**
- * @param authenticate the authenticate to set
- */
-public void setAuthenticate(boolean authenticate) {
-this.authenticate = authenticate;
-}
-
-/**
- * @return the passwordFile
- */
-public String getPasswordFile() {
-return passwordFile;
-}
-
-/**
- * @param passwordFile the passwordFile to set
- */
-public void setPasswordFile(String passwordFile) {
-this.passwordFile = passwordFile;
-}
-
-/**
- * @return the loginModuleName
- */
-public String getLoginModuleName() {
-return loginModuleName;
-}
-
-/**
- * @param loginModuleName the loginModuleName to set
- */
-public void setLoginModuleName(String loginModuleName) {
-this.loginModuleName = loginModuleName;
-}
-
-/**
- * @return the accessFile
- */
-public String getAccessFile() {
-return accessFile;
-}
-
-/**
- * @param accessFile the accessFile to set
- */
-public void setAccessFile(String accessFile) {
-this.accessFile =
Re: svn commit: r1852677 - in /tomcat/trunk/java/org/apache/tomcat/websocket/pojo: LocalStrings.properties PojoMethodMapping.java
On 01/02/2019 08:42, r...@apache.org wrote:
> Author: remm
> Date: Fri Feb 1 08:42:36 2019
> New Revision: 1852677
>
> URL: http://svn.apache.org/viewvc?rev=1852677&view=rev
> Log:
> i18n
:)
Thanks for spotting that. I meant to go back to it and forgot.
Mark
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
> tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties?rev=1852677&r1=1852676&r2=1852677&view=diff
> ==
> ---
> tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
> [UTF-8] (original)
> +++
> tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
> [UTF-8] Fri Feb 1 08:42:36 2019
> @@ -32,6 +32,7 @@ pojoMethodMapping.duplicatePongMessagePa
> pojoMethodMapping.duplicateSessionParam=Multiple session parameters present
> on the method [{0}] of class [{1}] that was annotated with OnMessage
> pojoMethodMapping.invalidDecoder=The specified decoder of type [{0}] could
> not be instantiated
> pojoMethodMapping.methodNotPublic=The annotated method [{0}] is not public
> +pojoMethodMapping.noDecoder=No decoder was found for message parameters
> present on the method [{0}] of class [{1}] that was annotated with OnMessage
> pojoMethodMapping.noPayload=No payload parameter present on the method [{0}]
> of class [{1}] that was annotated with OnMessage
> pojoMethodMapping.onErrorNoThrowable=No Throwable parameter was present on
> the method [{0}] of class [{1}] that was annotated with OnError
> pojoMethodMapping.paramWithoutAnnotation=A parameter of type [{0}] was found
> on method[{1}] of class [{2}] that did not have a @PathParam annotation
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1852677&r1=1852676&r2=1852677&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
> Fri Feb 1 08:42:36 2019
> @@ -485,7 +485,9 @@ public class PojoMethodMapping {
> if (decoderMatch.hasMatches()) {
> indexPayload = i;
> } else {
> -throw new DeploymentException("Boo!");
> +throw new DeploymentException(sm.getString(
> +"pojoMethodMapping.noDecoder",
> +m.getName(),
> m.getDeclaringClass().getName()));
> }
> }
> }
>
>
>
> -
> 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
Re: svn commit: r1852678 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/mbeans/ java/org/apache/tomcat/websocket/pojo/
On Fri, Feb 1, 2019 at 9:44 AM wrote: > Author: remm > Date: Fri Feb 1 08:44:00 2019 > New Revision: 1852678 > > URL: http://svn.apache.org/viewvc?rev=1852678&view=rev > Log: > i18n > > Modified: > tomcat/tc8.5.x/trunk/ (props changed) > > tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java > > tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties > Sorry for the bad commit and the noise. I don't intend to backport this anymore as the configuration is then a bit different. Rémy > > tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties > > tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java > > Propchange: tomcat/tc8.5.x/trunk/ > > -- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Fri Feb 1 08:44:00 2019 > @@ -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 > >
svn commit: r1852682 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/pojo/LocalStrings.properties java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Author: markt Date: Fri Feb 1 09:05:01 2019 New Revision: 1852682 URL: http://svn.apache.org/viewvc?rev=1852682&view=rev Log: i18n (remm) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 09:05:01 2019 @@ -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,1823165,1823341,1823490,1823493,1823498,1824299
svn commit: r1852685 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml
Author: markt
Date: Fri Feb 1 09:12:09 2019
New Revision: 1852685
URL: http://svn.apache.org/viewvc?rev=1852685&view=rev
Log:
Update Tomcat Native to 1.2.21
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1852685&r1=1852684&r2=1852685&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Fri Feb 1 09:12:09 2019
@@ -141,13 +141,13 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.19
+tomcat-native.version=1.2.21
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=7d69acd5dd684eee9a85c08357b7288a9f083c15a12a9524ba6344f1b9dcdc6ccc512a37b64b9f15b0e697609833e6c68591a60976dcfecce124ec29eb532dba
+tomcat-native.src.checksum.value=7f43f815785e5bc3e43f5b2e9ad1c90576a3c1528d57230328b7175bf475eb5f4e1f91b66fae74ad32cd76f044d7705f98a79109f6f84e5af75dc32bc8830b29
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=0b6349303b84632f4ce053e5ed1390571c17748f3527091936a197dcc9a686f768f913e86a431fe13dc7e0e1c3152fd13a5e501fbf95e82a096b27da6b942239
+tomcat-native.win.checksum.value=bd5e7bb6584cba635d780216b87d453ecca5034235f018ba8a7429b82d653aa58cf26b89520c60271e10f242bd8a10fce401f362ecfe0fab597c7b6983ad97ce
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1852685&r1=1852684&r2=1852685&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 1 09:12:09 2019
@@ -308,6 +308,10 @@
Update the internal fork of Apache Commons DBCP 2 to de20b77
(2019-01-29) to pick up some bug fixes and enhancements. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.21 to
+pick up the memory leak fixes when using NIO/NIO2 with OpenSSL. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852686 - in /tomcat/tc8.5.x/trunk: ./ build.properties.default webapps/docs/changelog.xml
Author: markt Date: Fri Feb 1 09:13:06 2019 New Revision: 1852686 URL: http://svn.apache.org/viewvc?rev=1852686&view=rev Log: Update Tomcat Native to 1.2.21 Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/build.properties.default tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 09:13:06 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568
svn commit: r1852687 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Fri Feb 1 09:15:59 2019 New Revision: 1852687 URL: http://svn.apache.org/viewvc?rev=1852687&view=rev Log: Move entry to correct version Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1852687&r1=1852686&r2=1852687&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Fri Feb 1 09:15:59 2019 @@ -200,6 +200,10 @@ to Tomcat clustering regardless of the type of cluster manager or membership being used. (schultz) + +Update the packaged version of the Tomcat Native Library to 1.2.21 to +pick up the memory leak fixes when using NIO/NIO2 with OpenSSL. (markt) + @@ -227,10 +231,6 @@ pick up the latest Windows binaries built with APR 1.6.5 and OpenSSL 1.1.1a. (markt) - -Update the packaged version of the Tomcat Native Library to 1.2.21 to -pick up the memory leak fixes when using NIO/NIO2 with OpenSSL. (markt) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852688 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml
Author: markt Date: Fri Feb 1 09:16:40 2019 New Revision: 1852688 URL: http://svn.apache.org/viewvc?rev=1852688&view=rev Log: Update Tomcat Native to 1.2.21 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 09:16:40 2019 @@ -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,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,1826690,18268
svn commit: r1852692 - in /tomcat/trunk: java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: markt Date: Fri Feb 1 10:08:30 2019 New Revision: 1852692 URL: http://svn.apache.org/viewvc?rev=1852692&view=rev Log: Update minimum recommended Tomcat version to 1.2.21 Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1852692&r1=1852691&r2=1852692&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Fri Feb 1 10:08:30 2019 @@ -68,7 +68,7 @@ public class AprLifecycleListener protected static final int TCN_REQUIRED_MINOR = 2; protected static final int TCN_REQUIRED_PATCH = 14; protected static final int TCN_RECOMMENDED_MINOR = 2; -protected static final int TCN_RECOMMENDED_PV = 19; +protected static final int TCN_RECOMMENDED_PV = 21; // -- Properties Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1852692&r1=1852691&r2=1852692&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 1 10:08:30 2019 @@ -134,6 +134,9 @@ Add SSL configuration options to the JMX remote listener using the SSLHostConfig framework. (remm) + +Update the recommended minimum Tomcat Native version to 1.2.21. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852693 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: markt Date: Fri Feb 1 10:09:12 2019 New Revision: 1852693 URL: http://svn.apache.org/viewvc?rev=1852693&view=rev Log: Update minimum recommended Tomcat version to 1.2.21 Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 10:09:12 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,176
svn commit: r1852694 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: markt Date: Fri Feb 1 10:10:49 2019 New Revision: 1852694 URL: http://svn.apache.org/viewvc?rev=1852694&view=rev Log: Update minimum recommended Tomcat version to 1.2.21 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 10:10:49 2019 @@ -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,1823165,1823341,1823490,1823493,1823498,1824299,1
svn commit: r1852697 - /tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
Author: remm
Date: Fri Feb 1 10:17:08 2019
New Revision: 1852697
URL: http://svn.apache.org/viewvc?rev=1852697&view=rev
Log:
Add missing string
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties?rev=1852697&r1=1852696&r2=1852697&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties
[UTF-8] Fri Feb 1 10:17:08 2019
@@ -27,6 +27,7 @@ jmxRemoteLifecycleListener.createRegistr
jmxRemoteLifecycleListener.createServerFailed=The JMX connector server could
not be created or failed to start for the [{0}] server
jmxRemoteLifecycleListener.destroyServerFailed=The JMX connector server could
not be stopped for the [{0}] server
jmxRemoteLifecycleListener.invalidRmiBindAddress=Invalid RMI bind address [{0}]
+jmxRemoteLifecycleListener.invalidSSLConfiguration=SSL configuration error
jmxRemoteLifecycleListener.invalidURL=The JMX Service URL requested for the
[{0}] server, [{1}], was invalid
jmxRemoteLifecycleListener.start=The JMX Remote Listener has configured the
registry on port [{0}] and the server on port [{1}] for the [{2}] server
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852698 - /tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
Author: markt
Date: Fri Feb 1 10:28:01 2019
New Revision: 1852698
URL: http://svn.apache.org/viewvc?rev=1852698&view=rev
Log:
Add stream timeouts
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1852698&r1=1852697&r2=1852698&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Fri Feb 1
10:28:01 2019
@@ -42,8 +42,10 @@ import org.apache.tomcat.util.net.Socket
public class Http2Protocol implements UpgradeProtocol {
static final long DEFAULT_READ_TIMEOUT = 1;
-static final long DEFAULT_KEEP_ALIVE_TIMEOUT = -1;
static final long DEFAULT_WRITE_TIMEOUT = 1;
+static final long DEFAULT_KEEP_ALIVE_TIMEOUT = -1;
+static final long DEFAULT_STREAM_READ_TIMEOUT = 2;
+static final long DEFAULT_STREAM_WRITE_TIMEOUT = 2;
// The HTTP/2 specification recommends a minimum default of 100
static final long DEFAULT_MAX_CONCURRENT_STREAMS = 200;
// Maximum amount of streams which can be concurrently executed over
@@ -57,9 +59,14 @@ public class Http2Protocol implements Up
private static final byte[] ALPN_IDENTIFIER =
ALPN_NAME.getBytes(StandardCharsets.UTF_8);
// All timeouts in milliseconds
+// These are the socket level timeouts
private long readTimeout = DEFAULT_READ_TIMEOUT;
-private long keepAliveTimeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
private long writeTimeout = DEFAULT_WRITE_TIMEOUT;
+private long keepAliveTimeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
+// These are the stream level timeouts
+private long streamReadTimeout = DEFAULT_STREAM_READ_TIMEOUT;
+private long streamWriteTimeout = DEFAULT_STREAM_WRITE_TIMEOUT;
+
private long maxConcurrentStreams = DEFAULT_MAX_CONCURRENT_STREAMS;
private int maxConcurrentStreamExecution =
DEFAULT_MAX_CONCURRENT_STREAM_EXECUTION;
// If a lower initial value is required, set it here but DO NOT change the
@@ -145,6 +152,16 @@ public class Http2Protocol implements Up
}
+public long getWriteTimeout() {
+return writeTimeout;
+}
+
+
+public void setWriteTimeout(long writeTimeout) {
+this.writeTimeout = writeTimeout;
+}
+
+
public long getKeepAliveTimeout() {
return keepAliveTimeout;
}
@@ -155,13 +172,23 @@ public class Http2Protocol implements Up
}
-public long getWriteTimeout() {
-return writeTimeout;
+public long getStreamReadTimeout() {
+return streamReadTimeout;
}
-public void setWriteTimeout(long writeTimeout) {
-this.writeTimeout = writeTimeout;
+public void setStreamReadTimeout(long streamReadTimeout) {
+this.streamReadTimeout = streamReadTimeout;
+}
+
+
+public long getStreamWriteTimeout() {
+return streamWriteTimeout;
+}
+
+
+public void setStreamWriteTimeout(long streamWriteTimeout) {
+this.streamWriteTimeout = streamWriteTimeout;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852700 - in /tomcat/trunk: java/org/apache/coyote/http2/LocalStrings.properties java/org/apache/coyote/http2/Stream.java test/org/apache/coyote/http2/Http2TestBase.java test/org/apache/c
Author: markt
Date: Fri Feb 1 10:28:14 2019
New Revision: 1852700
URL: http://svn.apache.org/viewvc?rev=1852700&view=rev
Log:
Implement read timeout for direct read of request body
Modified:
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Timeouts.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1852700&r1=1852699&r2=1852700&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties [UTF-8]
Fri Feb 1 10:28:14 2019
@@ -91,6 +91,7 @@ stream.header.unknownPseudoHeader=Connec
stream.inputBuffer.copy=Copying [{0}] bytes from inBuffer to outBuffer
stream.inputBuffer.dispatch=Data added to inBuffer when read interest is
registered. Triggering a read dispatch
stream.inputBuffer.empty=The Stream input buffer is empty. Waiting for more
data
+stream.inputBuffer.readTimeout=Timeout waiting to read data from client
stream.inputBuffer.reset=Stream reset
stream.inputBuffer.signal=Data added to inBuffer when read thread is waiting.
Signalling that thread to continue
stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1852700&r1=1852699&r2=1852700&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Feb 1 10:28:14
2019
@@ -977,10 +977,22 @@ class Stream extends AbstractStream impl
if (log.isDebugEnabled()) {
log.debug(sm.getString("stream.inputBuffer.empty"));
}
-inBuffer.wait();
+
+
inBuffer.wait(handler.getProtocol().getStreamReadTimeout());
+
if (resetReceived) {
throw new
IOException(sm.getString("stream.inputBuffer.reset"));
}
+
+if (inBuffer.position() == 0) {
+String msg =
sm.getString("stream.inputBuffer.readTimeout");
+StreamException se = new StreamException(
+msg, Http2Error.ENHANCE_YOUR_CALM,
getIdAsInt());
+// Trigger a reset once control returns to Tomcat
+coyoteResponse.setError();
+streamOutputBuffer.reset = se;
+throw new CloseNowException(msg, se);
+}
} catch (InterruptedException e) {
// Possible shutdown / rst or similar. Use an
// IOException to signal to the client that further I/O
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1852700&r1=1852699&r2=1852700&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Fri Feb 1
10:28:14 2019
@@ -28,6 +28,7 @@ import java.nio.charset.StandardCharsets
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.Random;
import javax.net.SocketFactory;
@@ -302,6 +303,24 @@ public abstract class Http2TestBase exte
}
+protected void sendParameterPostRequest(int streamId, byte[] padding,
String body,
+long contentLength, boolean useExpectation) throws IOException {
+byte[] headersFrameHeader = new byte[9];
+ByteBuffer headersPayload = ByteBuffer.allocate(128);
+byte[] dataFrameHeader = new byte[9];
+ByteBuffer dataPayload = ByteBuffer.allocate(128);
+
+buildPostRequest(headersFrameHeader, headersPayload, useExpectation,
+"application/x-www-form-urlencoded", contentLength,
"/parameter", dataFrameHeader,
+dataPayload, padding, null, null, streamId);
+writeFrame(headersFrameHeader, headersPayload);
+if (body != null) {
+dataPayload.put(body.getBytes(StandardCharsets.ISO_8859_1));
+writeFrame(dataFrameHeader, dataPayload);
+}
+}
+
+
protected void buildPostR
svn commit: r1852701 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2Protocol.java Http2UpgradeHandler.java
Author: markt
Date: Fri Feb 1 10:28:18 2019
New Revision: 1852701
URL: http://svn.apache.org/viewvc?rev=1852701&view=rev
Log:
Use true keep-alive timeout when there are no active streams
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1852701&r1=1852700&r2=1852701&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Fri Feb 1
10:28:18 2019
@@ -41,9 +41,9 @@ import org.apache.tomcat.util.net.Socket
public class Http2Protocol implements UpgradeProtocol {
-static final long DEFAULT_READ_TIMEOUT = 1;
-static final long DEFAULT_WRITE_TIMEOUT = 1;
-static final long DEFAULT_KEEP_ALIVE_TIMEOUT = -1;
+static final long DEFAULT_READ_TIMEOUT = 5000;
+static final long DEFAULT_WRITE_TIMEOUT = 5000;
+static final long DEFAULT_KEEP_ALIVE_TIMEOUT = 2;
static final long DEFAULT_STREAM_READ_TIMEOUT = 2;
static final long DEFAULT_STREAM_WRITE_TIMEOUT = 2;
// The HTTP/2 specification recommends a minimum default of 100
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1852701&r1=1852700&r2=1852701&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Feb
1 10:28:18 2019
@@ -329,9 +329,16 @@ class Http2UpgradeHandler extends Abstra
}
}
}
-// No more frames to read so switch to the keep-alive
-// timeout.
-
socketWrapper.setReadTimeout(protocol.getKeepAliveTimeout());
+
+if (activeRemoteStreamCount.get() == 0) {
+// No streams currently active. Use the keep-alive
+// timeout for the connection.
+
socketWrapper.setReadTimeout(protocol.getKeepAliveTimeout());
+} else {
+// Streams currently active. Individual streams have
+// timeouts so keep the connection open.
+socketWrapper.setReadTimeout(-1);
+}
} catch (Http2Exception ce) {
// Really ConnectionException
if (log.isDebugEnabled()) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852699 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/coyote/http2/ test/org/apache/coyote/http2/
Author: markt
Date: Fri Feb 1 10:28:08 2019
New Revision: 1852699
URL: http://svn.apache.org/viewvc?rev=1852699&view=rev
Log:
Implement a write timeout for individual Streams
Added:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Timeouts.java (with
props)
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1852699&r1=1852698&r2=1852699&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Fri Feb
1 10:28:08 2019
@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.catalina.Globals;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.CloseNowException;
import org.apache.coyote.Response;
import org.apache.tomcat.util.buf.C2BConverter;
import org.apache.tomcat.util.res.StringManager;
@@ -326,6 +327,13 @@ public class OutputBuffer extends Writer
// real write to the adapter
try {
coyoteResponse.doWrite(buf);
+} catch (CloseNowException e) {
+// Catch this sub-class as it requires specific handling.
+// Examples where this exception is thrown:
+// - HTTP/2 stream timeout
+// Prevent further output for this response
+closed = true;
+throw e;
} catch (IOException e) {
// An IOException on a write is almost always due to
// the remote client aborting the request. Wrap this
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1852699&r1=1852698&r2=1852699&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Fri
Feb 1 10:28:08 2019
@@ -36,6 +36,7 @@ import org.apache.catalina.connector.Cli
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.valves.ValveBase;
+import org.apache.coyote.CloseNowException;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.log.SystemLogHandler;
@@ -201,7 +202,7 @@ final class StandardWrapperValve
}
}
-} catch (ClientAbortException e) {
+} catch (ClientAbortException | CloseNowException e) {
if (container.getLogger().isDebugEnabled()) {
container.getLogger().debug(sm.getString(
"standardWrapper.serviceException", wrapper.getName(),
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1852699&r1=1852698&r2=1852699&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties [UTF-8]
Fri Feb 1 10:28:08 2019
@@ -100,6 +100,7 @@ stream.reset.fail=Connection [{0}], Stre
stream.reset.receive=Connection [{0}], Stream [{1}], Reset received due to
[{2}]
stream.reset.send=Connection [{0}], Stream [{1}], Reset sent due to [{2}]
stream.trailerHeader.noEndOfStream=Connection [{0}], Stream [{1}], The trailer
headers did not include the end of stream flag
+stream.writeTimeout=Timeout waiting for client to increase flow control window
to permit stream data to be written
streamProcessor.error.connection=Connection [{0}], Stream [{1}], An error
occurred during processing that was fatal to the connection
streamProcessor.error.stream=Connection [{0}], Stream [{1}], An error occurred
during processing that was fatal to the stream
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1852699&r1=1852698&r2=1852699&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/St
svn commit: r1852702 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2Protocol.java Http2UpgradeHandler.java
Author: markt
Date: Fri Feb 1 10:28:22 2019
New Revision: 1852702
URL: http://svn.apache.org/viewvc?rev=1852702&view=rev
Log:
Track overhead and close connections with excessive overhead
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1852702&r1=1852701&r2=1852702&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Fri Feb 1
10:28:22 2019
@@ -54,6 +54,8 @@ public class Http2Protocol implements Up
// This default is defined by the HTTP/2 specification
static final int DEFAULT_INITIAL_WINDOW_SIZE = (1 << 16) - 1;
+static final int DEFAULT_OVERHEAD_COUNT_FACTOR = 1;
+
private static final String HTTP_UPGRADE_NAME = "h2c";
private static final String ALPN_NAME = "h2";
private static final byte[] ALPN_IDENTIFIER =
ALPN_NAME.getBytes(StandardCharsets.UTF_8);
@@ -79,6 +81,8 @@ public class Http2Protocol implements Up
private int maxHeaderSize = Constants.DEFAULT_MAX_HEADER_SIZE;
private int maxTrailerCount = Constants.DEFAULT_MAX_TRAILER_COUNT;
private int maxTrailerSize = Constants.DEFAULT_MAX_TRAILER_SIZE;
+private int overheadCountFactor = DEFAULT_OVERHEAD_COUNT_FACTOR;
+
private boolean initiatePingDisabled = false;
private boolean useSendfile = true;
// Compression
@@ -306,6 +310,16 @@ public class Http2Protocol implements Up
}
+public int getOverheadCountFactor() {
+return overheadCountFactor;
+}
+
+
+public void setOverheadCountFactor(int overheadCountFactor) {
+this.overheadCountFactor = overheadCountFactor;
+}
+
+
public void setInitiatePingDisabled(boolean initiatePingDisabled) {
this.initiatePingDisabled = initiatePingDisabled;
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1852702&r1=1852701&r2=1852702&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Feb
1 10:28:22 2019
@@ -30,6 +30,7 @@ import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import javax.servlet.http.WebConnection;
@@ -139,6 +140,9 @@ class Http2UpgradeHandler extends Abstra
private AtomicInteger streamConcurrency = null;
private Queue queuedRunnable = null;
+// Track 'overhead' frames vs 'request/response' frames
+private final AtomicLong overheadCount = new AtomicLong(-10);
+
Http2UpgradeHandler(Http2Protocol protocol, Adapter adapter, Request
coyoteRequest) {
super (STREAM_ID_ZERO);
@@ -330,6 +334,10 @@ class Http2UpgradeHandler extends Abstra
}
}
+if (overheadCount.get() > 0) {
+throw new ConnectionException("Too much overhead",
Http2Error.ENHANCE_YOUR_CALM);
+}
+
if (activeRemoteStreamCount.get() == 0) {
// No streams currently active. Use the keep-alive
// timeout for the connection.
@@ -638,6 +646,9 @@ class Http2UpgradeHandler extends Abstra
log.debug(sm.getString("upgradeHandler.writeBody", connectionId,
stream.getIdentifier(),
Integer.toString(len)));
}
+
+reduceOverheadCount();
+
// Need to check this now since sending end of stream will change this.
boolean writeable = stream.canWrite();
byte[] header = new byte[9];
@@ -1193,6 +1204,16 @@ class Http2UpgradeHandler extends Abstra
}
+private void reduceOverheadCount() {
+overheadCount.decrementAndGet();
+}
+
+
+private void increaseOverheadCount() {
+overheadCount.addAndGet(getProtocol().getOverheadCountFactor());
+}
+
+
// --- Http2Parser.Input
methods
@Override
@@ -1247,6 +1268,7 @@ class Http2UpgradeHandler extends Abstra
@Override
public ByteBuffer startRequestBodyFrame(int streamId, int payloadSize)
throws Http2Exception {
+reduceOverheadCount();
Stream stream = getStream(streamId, true);
stream.checkState(FrameType.DAT
svn commit: r1852703 - /tomcat/trunk/webapps/docs/config/http2.xml
Author: markt Date: Fri Feb 1 10:28:26 2019 New Revision: 1852703 URL: http://svn.apache.org/viewvc?rev=1852703&view=rev Log: Update docs Modified: tomcat/trunk/webapps/docs/config/http2.xml Modified: tomcat/trunk/webapps/docs/config/http2.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http2.xml?rev=1852703&r1=1852702&r2=1852703&view=diff == --- tomcat/trunk/webapps/docs/config/http2.xml (original) +++ tomcat/trunk/webapps/docs/config/http2.xml Fri Feb 1 10:28:26 2019 @@ -125,9 +125,9 @@ The time, in milliseconds, that Tomcat will wait between HTTP/2 frames - before closing the connection. Negative values will be treated as an - infinite timeout. If not specified, a default value of -1 - will be used. + when there is no active Stream before closing the connection. Negative + values will be treated as an infinite timeout. If not specified, a default + value of 2 will be used. @@ -192,7 +192,24 @@ The time, in milliseconds, that Tomcat will wait for additional data when a partial HTTP/2 frame has been received. Negative values will be treated as an infinite timeout. If not specified, a default value of - 1 will be used. + 5000 will be used. + + + + The time, in milliseconds, that Tomcat will wait for additional data + frames to arrive for the stream when an application is performing a + blocking I/O read and additional data is required. Negative values will be + treated as an infinite timeout. If not specified, a default value of + 2 will be used. + + + + The time, in milliseconds, that Tomcat will wait for additional window + update frames to arrive for the stream and/or conenction when an + application is performing a blocking I/O write and the stream and/or + connection flow control window is too small for the write to complete. + Negative values will be treated as an infinite timeout. If not specified, + a default value of 2 will be used. @@ -204,7 +221,7 @@ The time, in milliseconds, that Tomcat will wait to write additional data when an HTTP/2 frame has been partially written. Negative values will be treated as an infinite timeout. If not specified, a default value of - 1 will be used. + 5000 will be used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852704 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Author: markt
Date: Fri Feb 1 10:28:30 2019
New Revision: 1852704
URL: http://svn.apache.org/viewvc?rev=1852704&view=rev
Log:
Align behaviour for -ve stream timeouts with documentation
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1852704&r1=1852703&r2=1852704&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Feb 1 10:28:30
2019
@@ -222,7 +222,12 @@ class Stream extends AbstractStream impl
}
try {
if (block) {
-wait(handler.getProtocol().getStreamWriteTimeout());
+long writeTimeout =
handler.getProtocol().getStreamWriteTimeout();
+if (writeTimeout < 0) {
+wait();
+} else {
+wait(writeTimeout);
+}
windowSize = getWindowSize();
if (windowSize == 0) {
String msg = sm.getString("stream.writeTimeout");
@@ -978,7 +983,12 @@ class Stream extends AbstractStream impl
log.debug(sm.getString("stream.inputBuffer.empty"));
}
-
inBuffer.wait(handler.getProtocol().getStreamReadTimeout());
+long readTimeout =
handler.getProtocol().getStreamReadTimeout();
+if (readTimeout < 0) {
+inBuffer.wait();
+} else {
+inBuffer.wait(readTimeout);
+}
if (resetReceived) {
throw new
IOException(sm.getString("stream.inputBuffer.reset"));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852705 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2UpgradeHandler.java LocalStrings.properties
Author: markt
Date: Fri Feb 1 10:28:34 2019
New Revision: 1852705
URL: http://svn.apache.org/viewvc?rev=1852705&view=rev
Log:
Localisation
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1852705&r1=1852704&r2=1852705&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Feb
1 10:28:34 2019
@@ -335,7 +335,9 @@ class Http2UpgradeHandler extends Abstra
}
if (overheadCount.get() > 0) {
-throw new ConnectionException("Too much overhead",
Http2Error.ENHANCE_YOUR_CALM);
+throw new ConnectionException(
+sm.getString("upgradeHandler.tooMuchOverhead",
connectionId),
+Http2Error.ENHANCE_YOUR_CALM);
}
if (activeRemoteStreamCount.get() == 0) {
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1852705&r1=1852704&r2=1852705&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties [UTF-8]
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties [UTF-8]
Fri Feb 1 10:28:34 2019
@@ -141,6 +141,7 @@ upgradeHandler.stream.even=A new remote
upgradeHandler.stream.notWritable=Connection [{0}], Stream [{1}], This stream
is not writable
upgradeHandler.stream.old=A new remote stream ID of [{0}] was requested but
the most recent stream was [{1}]
upgradeHandler.tooManyRemoteStreams=The client attempted to use more than
[{0}] active streams
+upgradeHandler.tooMuchOverhead=Connection [{0}], Too much overhead so the
connection will be closed
upgradeHandler.unexpectedAck=Connection [{0}], Stream [{1}], A settings
acknowledgement was received when not expected
upgradeHandler.unexpectedEos=Unexpected end of stream
upgradeHandler.upgrade=Connection [{0}], HTTP/1.1 upgrade to stream [1]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852706 - /tomcat/trunk/webapps/docs/config/http2.xml
Author: markt Date: Fri Feb 1 10:28:38 2019 New Revision: 1852706 URL: http://svn.apache.org/viewvc?rev=1852706&view=rev Log: Document new configuration option Modified: tomcat/trunk/webapps/docs/config/http2.xml Modified: tomcat/trunk/webapps/docs/config/http2.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http2.xml?rev=1852706&r1=1852705&r2=1852706&view=diff == --- tomcat/trunk/webapps/docs/config/http2.xml (original) +++ tomcat/trunk/webapps/docs/config/http2.xml Fri Feb 1 10:28:38 2019 @@ -188,6 +188,20 @@ The default value is an empty String (regexp matching disabled). + + The factor to apply when counting overhead frames to determine if a + connection has too high an overhead and should be closed. The overhead + count starts at -10. The count is decreased for each + data frame sent or received and each headers frame received. The count is + increased by the overheadCountFactorfor each setting + received, priority frame received and ping received. If the overhead count + exceeds zero, the connection is closed. A value of less than + 1 disables this protection. In normal usage a value of + 3 or more will close the connection before any streams can + complete. If not specified, a default value of 1 will be + used. + + The time, in milliseconds, that Tomcat will wait for additional data when a partial HTTP/2 frame has been received. Negative values will be - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852707 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2Protocol.java
Author: markt Date: Fri Feb 1 10:29:36 2019 New Revision: 1852707 URL: http://svn.apache.org/viewvc?rev=1852707&view=rev Log: Add stream timeouts Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 10:29:36 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718
svn commit: r1852708 - /tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/AbstractStream.java
Author: markt
Date: Fri Feb 1 10:36:29 2019
New Revision: 1852708
URL: http://svn.apache.org/viewvc?rev=1852708&view=rev
Log:
Align 8.5.x with 9.0.x
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/AbstractStream.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/AbstractStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/AbstractStream.java?rev=1852708&r1=1852707&r2=1852708&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/AbstractStream.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/AbstractStream.java Fri
Feb 1 10:36:29 2019
@@ -109,7 +109,7 @@ abstract class AbstractStream {
/**
* Increment window size.
- * @param increment The amount of the incrementation
+ * @param increment The amount by which the window size should be increased
* @throws Http2Exception If the window size is now higher than
* the maximum allowed
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852710 - /tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Author: markt Date: Fri Feb 1 10:45:55 2019 New Revision: 1852710 URL: http://svn.apache.org/viewvc?rev=1852710&view=rev Log: Simplify (and align with 8.5.x) Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1852710&r1=1852709&r2=1852710&view=diff == --- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Fri Feb 1 10:45:55 2019 @@ -85,7 +85,7 @@ class StreamProcessor extends AbstractPr se = new StreamException(sm.getString( "streamProcessor.error.stream", stream.getConnectionId(), stream.getIdentifier()), Http2Error.INTERNAL_ERROR, -stream.getIdentifier().intValue()); +stream.getIdAsInt()); } stream.close(se); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
TC test suite results non-native
Hi there, I ran the test suite for a wide range of combinations of TC versions (7, 8.5 and 9 head), Java versions (1.7.0, 1.8.0 and 11 - where applicable) and OpenSSL (1.1.1a, 1.1.1, 1.1.0i, 1.1.0e, 1.0.2q, 1.0.2). tc revision was 1852637, tcnative was always 1.2.21, platforms where Solaris 10 Sparc, SLES11+12, RHEL 6+7. Connectors where APR, BIO, IO, NIO2 (where aplicable), tcnative tests run with all connectors and OpenSSL based impl. Some failures might be well known. I think first there's a need for some triage (possible false positives). I will send the tcnative based results separately. Non-tcnative A total of 42 runs (16 TC 7, 16 TC 8.5, 10 TC 9; 8 bio, 21 nio, 13 nio2; 16 RHEL7, 16 SLES12, 10 Solaris). For the TLS tests note that when testing non-tcnative, I do not give explicit pathes or versions for OpenSSL, so a platform OpenSSl is beng used. For the version dependent parts of the TLS tests, it makes more sense to look at the tcnative results, which are based on explicitly given OpenSSL versions. Websocket Failures -- - org.apache.catalina.websocket.TestWebSocket Only tc7.0.x, RHEL7, SLES12, Java 11, bio+nio: Failure detail: Testcase: testKey took 2.006 sec Caused an ERROR javax/xml/bind/DatatypeConverter java.lang.NoClassDefFoundError: javax/xml/bind/DatatypeConverter at org.apache.catalina.util.Base64.encode(Base64.java:93) at org.apache.catalina.websocket.TestWebSocket.testKey(TestWebSocket.java:261) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) Caused by: java.lang.ClassNotFoundException: javax.xml.bind.DatatypeConverter at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:583) at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:178) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:521) Testcase: testBug53339 took 0.202 sec FAILED null junit.framework.AssertionFailedError at org.apache.catalina.websocket.TestWebSocket.testBug53339(TestWebSocket.java:307) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - org.apache.tomcat.websocket.TestWebSocketFrameClientSSL Failing sporadically on tc9.0.x for nio2 with Java 1.8.0, here for RHEL7 and Solaris 10 Sparc Failure detail: Testcase: testBug56032 took 77.859 sec FAILED There are [1] connections still open junit.framework.AssertionFailedError: There are [1] connections still open at org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.testBug56032(TestWebSocketFrameClientSSL.java:147) Testcase: testBug56032 took 77.859 sec FAILED expected:<0> but was:<1> junit.framework.AssertionFailedError: expected:<0> but was:<1> at org.apache.tomcat.websocket.WebSocketBaseTest.checkBackgroundProcessHasStopped(WebSocketBaseTest.java:45) TLS --- - org.apache.tomcat.util.net.TestSsl Only failing for tc7.0.x, RHEL7+SLES12+Solaris 10 Sparc, Java 11+1.8.0 (not 1.7.0), bio+nio: E bio jdk1.8.0 RHEL7 E bio jdk1.8.0 SLES12 E bio jdk1.8.0 SOLARIS R bio jdk11 RHEL7 R bio jdk11 SLES12 R nio jdk1.8.0 RHEL7 R nio jdk1.8.0 SLES12 D nio jdk1.8.0 SOLARIS R nio jdk11 RHEL7 R nio jdk11 SLES12 R, E and D denote different types of failures or errors, all during reneg tests: -- R (Re-negotiation worked in testRenegotiateFail) Testcase: testRenegotiateFail took 0.543 sec FAILED Re-negotiation worked junit.framework.AssertionFailedError: Re-negotiation worked at org.apache.tomcat.util.net.TestSsl.testRenegotiateFail(TestSsl.java:151) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) -- E (handshake_failure in testRenegotiateWorks, testRenegotiateFail) Testcase: testRenegotiateWorks took 0.394 sec Caused an ERROR Received fatal alert: handshake_failure javax.net.ssl.SSLHandshakeException: Received fatal alert: handshake_failure at sun.security.ssl.Alerts.getSSLException(Alerts.java:192) at sun.security.ssl.Alerts.getSSLException(Alerts.java:154) at sun.security.ssl.SSLSocketImpl.recvAlert(SSLSocketImpl.java:2020) at sun.security.ssl.SSLSocketImpl.readRecord(SSLSocketI
svn commit: r1852711 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/Response.java java/org/apache/coyote/Response.java
Author: markt Date: Fri Feb 1 10:52:53 2019 New Revision: 1852711 URL: http://svn.apache.org/viewvc?rev=1852711&view=rev Log: Push the error state tracking down to the Coyote Response so it becomes accessible to the early stages of request processing and to HTTP/2 internals. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Response.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 10:52:53 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-17633
svn commit: r1852712 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/coyote/http2/ test/org/apache/coyote/http2/
Author: markt Date: Fri Feb 1 10:55:24 2019 New Revision: 1852712 URL: http://svn.apache.org/viewvc?rev=1852712&view=rev Log: Implement a write timeout for individual Streams Added: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHttp2Timeouts.java - copied unchanged from r1852699, tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Timeouts.java Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 10:55:24 2019 @@ -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,17615
svn commit: r1852713 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/LocalStrings.properties java/org/apache/coyote/http2/Stream.java test/org/apache/coyote/http2/Http2TestBase.java test/o
Author: markt Date: Fri Feb 1 10:58:19 2019 New Revision: 1852713 URL: http://svn.apache.org/viewvc?rev=1852713&view=rev Log: Implement read timeout for direct read of request body Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHttp2Timeouts.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 10:58:19 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179
svn commit: r1852714 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2Protocol.java java/org/apache/coyote/http2/Http2UpgradeHandler.java
Author: markt Date: Fri Feb 1 11:04:20 2019 New Revision: 1852714 URL: http://svn.apache.org/viewvc?rev=1852714&view=rev Log: Use true keep-alive timeout when there are no active streams Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 11:04:20 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462
svn commit: r1852715 - /tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
Author: markt
Date: Fri Feb 1 11:10:53 2019
New Revision: 1852715
URL: http://svn.apache.org/viewvc?rev=1852715&view=rev
Log:
Correct back-port
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java?rev=1852715&r1=1852714&r2=1852715&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java Fri Feb 1
11:10:53 2019
@@ -1051,11 +1051,23 @@ public class Stream extends AbstractStre
if (log.isDebugEnabled()) {
log.debug(sm.getString("stream.inputBuffer.empty"));
}
-inBuffer.wait();
+
+
inBuffer.wait(handler.getProtocol().getStreamReadTimeout());
+
if (resetReceived) {
// TODO: i18n
throw new IOException("HTTP/2 Stream reset");
}
+
+if (inBuffer.position() == 0) {
+String msg =
sm.getString("stream.inputBuffer.readTimeout");
+StreamException se = new StreamException(
+msg, Http2Error.ENHANCE_YOUR_CALM,
getIdAsInt());
+// Trigger a reset once control returns to Tomcat
+coyoteResponse.setError();
+streamOutputBuffer.reset = se;
+throw new CloseNowException(msg, se);
+}
} catch (InterruptedException e) {
// Possible shutdown / rst or similar. Use an
// IOException to signal to the client that further I/O
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852717 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/LocalStrings.properties java/org/apache/coyote/http2/Stream.java
Author: markt Date: Fri Feb 1 11:13:53 2019 New Revision: 1852717 URL: http://svn.apache.org/viewvc?rev=1852717&view=rev Log: Unlock a blocking read (with an IOE) when a stream exception occurs. The likely bad behavior is seen in many tests in the testsuite. Originally I think this is supposed to wait for a reset frame, but I don't really see a benefit. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 11:13:53 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762
[Bug 62140] catalina.sh should document the verbs it accepts as command-line arguments
https://bz.apache.org/bugzilla/show_bug.cgi?id=62140 --- Comment #3 from Dhruv --- I would like to work on this issue. Can I take this up or is someone else working on it. -- 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: r1852718 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2Protocol.java java/org/apache/coyote/http2/Http2UpgradeHandler.java
Author: markt Date: Fri Feb 1 11:19:06 2019 New Revision: 1852718 URL: http://svn.apache.org/viewvc?rev=1852718&view=rev Log: Track overhead and close connections with excessive overhead Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 11:19:06 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462
[Bug 62140] catalina.sh should document the verbs it accepts as command-line arguments
https://bz.apache.org/bugzilla/show_bug.cgi?id=62140 --- Comment #4 from Dhruv --- I would like to work on this issue. Can I take this up or is someone else working on it. -- 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: r1852719 - /tomcat/tc8.5.x/trunk/webapps/docs/config/http2.xml
Author: markt Date: Fri Feb 1 11:20:19 2019 New Revision: 1852719 URL: http://svn.apache.org/viewvc?rev=1852719&view=rev Log: Update docs Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/http2.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/http2.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/http2.xml?rev=1852719&r1=1852718&r2=1852719&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/config/http2.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/config/http2.xml Fri Feb 1 11:20:19 2019 @@ -125,9 +125,9 @@ The time, in milliseconds, that Tomcat will wait between HTTP/2 frames - before closing the connection. Negative values will be treated as an - infinite timeout. If not specified, a default value of -1 - will be used. + when there is no active Stream before closing the connection. Negative + values will be treated as an infinite timeout. If not specified, a default + value of 2 will be used. @@ -192,14 +192,31 @@ The time, in milliseconds, that Tomcat will wait for additional data when a partial HTTP/2 frame has been received. Negative values will be treated as an infinite timeout. If not specified, a default value of - 1 will be used. + 5000 will be used. + + + + The time, in milliseconds, that Tomcat will wait for additional data + frames to arrive for the stream when an application is performing a + blocking I/O read and additional data is required. Negative values will be + treated as an infinite timeout. If not specified, a default value of + 2 will be used. + + + + The time, in milliseconds, that Tomcat will wait for additional window + update frames to arrive for the stream and/or conenction when an + application is performing a blocking I/O write and the stream and/or + connection flow control window is too small for the write to complete. + Negative values will be treated as an infinite timeout. If not specified, + a default value of 2 will be used. The time, in milliseconds, that Tomcat will wait to write additional data when an HTTP/2 frame has been partially written. Negative values will be treated as an infinite timeout. If not specified, a default value of - 1 will be used. + 5000 will be used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852722 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Stream.java
Author: markt Date: Fri Feb 1 11:22:50 2019 New Revision: 1852722 URL: http://svn.apache.org/viewvc?rev=1852722&view=rev Log: Align behaviour for -ve stream timeouts with documentation Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 11:22:50 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574
svn commit: r1852723 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/Http2UpgradeHandler.java java/org/apache/coyote/http2/LocalStrings.properties
Author: markt Date: Fri Feb 1 11:23:42 2019 New Revision: 1852723 URL: http://svn.apache.org/viewvc?rev=1852723&view=rev Log: Localisation Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 11:23:42 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,17
[Bug 62140] catalina.sh should document the verbs it accepts as command-line arguments
https://bz.apache.org/bugzilla/show_bug.cgi?id=62140 --- Comment #5 from Mark Thomas --- It is yours. Go for it. -- 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: r1852724 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/config/http2.xml
Author: markt Date: Fri Feb 1 11:24:13 2019 New Revision: 1852724 URL: http://svn.apache.org/viewvc?rev=1852724&view=rev Log: Document new configuration option Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/webapps/docs/config/http2.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 11:24:13 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,176
svn commit: r1852739 - in /tomcat/tc7.0.x/trunk: build.xml java/org/apache/catalina/websocket/WebSocketServlet.java test/org/apache/catalina/websocket/TestWebSocket.java webapps/docs/changelog.xml
Author: markt
Date: Fri Feb 1 13:25:42 2019
New Revision: 1852739
URL: http://svn.apache.org/viewvc?rev=1852739&view=rev
Log:
Fix compilation and test issues when using Java 11:
- References to deprecated o.a.c.util.Base64 class updated to use replacement
- Same class excluded from build when using Java 11+
- Remove use of bootclasspath as it breaks with Java 11 due to Java 11 using a
different file structure and it was only present to prevent a warning
Modified:
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1852739&r1=1852738&r2=1852739&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Feb 1 13:25:42 2019
@@ -184,6 +184,9 @@
+
+
+
@@ -661,6 +664,7 @@
+
@@ -700,12 +704,6 @@
-
-
-
-
-
-
@@ -1341,6 +1339,7 @@
+
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1852739&r1=1852738&r2=1852739&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Fri Feb 1 13:25:42 2019
@@ -34,17 +34,17 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.RequestFacade;
-import org.apache.catalina.util.Base64;
import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.util.res.StringManager;
/**
* Provides the base implementation of a Servlet for processing WebSocket
* connections as per RFC6455. It is expected that applications will extend
this
* implementation and provide application specific functionality.
- *
+ *
* @deprecated Replaced by the JSR356 WebSocket 1.1 implementation and will be
- * removed in Tomcat 8.0.x.
+ * removed in Tomcat 8.0.x.
*/
@Deprecated
public abstract class WebSocketServlet extends HttpServlet {
@@ -193,7 +193,7 @@ public abstract class WebSocketServlet e
sha1Helper.reset();
sha1Helper.update(key.getBytes(B2CConverter.ISO_8859_1));
-String result = Base64.encode(sha1Helper.digest(WS_ACCEPT));
+String result =
Base64.encodeBase64String(sha1Helper.digest(WS_ACCEPT));
sha1Helpers.add(sha1Helper);
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java?rev=1852739&r1=1852738&r2=1852739&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
Fri Feb 1 13:25:42 2019
@@ -44,11 +44,11 @@ import org.apache.catalina.deploy.Contex
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.catalina.util.Base64;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.C2BConverter;
import org.apache.tomcat.util.buf.CharChunk;
+import org.apache.tomcat.util.codec.binary.Base64;
import org.apache.tomcat.websocket.TesterEchoServer;
/**
@@ -258,12 +258,12 @@ public class TestWebSocket extends Tomca
MessageDigest sha1Helper = MessageDigest.getInstance("SHA1");
sha1Helper.reset();
sha1Helper.update("TODO".getBytes(B2CConverter.ISO_8859_1));
-String source = Base64.encode(sha1Helper.digest(WS_ACCEPT));
+String source =
Base64.encodeBase64String(sha1Helper.digest(WS_ACCEPT));
Assert.assertEquals(source,accept);
sha1Helper.reset();
sha1Helper.update("TOD".getBytes(B2CConverter.ISO_8859_1));
-source = Base64.encode(sha1Helper.digest(WS_ACCEPT));
+source = Base64.encodeBase64String(sha1Helper.digest(WS_ACCEPT));
Assert.assertFalse(source.equals(accept));
// Finished with the socket
client.close();
Modified: tomcat/tc7.0.x/trunk/webapps/docs/ch
svn commit: r1852740 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Author: markt
Date: Fri Feb 1 13:43:34 2019
New Revision: 1852740
URL: http://svn.apache.org/viewvc?rev=1852740&view=rev
Log:
Note intermittent failure
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1852740&r1=1852739&r2=1852740&view=diff
==
---
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Fri Feb 1 13:43:34 2019
@@ -87,6 +87,9 @@ public class TestWebSocketFrameClientSSL
}
+/*
+ * TODO: Fails intermittently with NIO2.
+ */
@Test
public void testBug56032() throws Exception {
Tomcat tomcat = getTomcatInstance();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: TC test suite results non-native
On 01/02/2019 10:45, Rainer Jung wrote: > - org.apache.catalina.websocket.TestWebSocket > > Only tc7.0.x, RHEL7, SLES12, Java 11, bio+nio: > > Failure detail: > > Testcase: testKey took 2.006 sec > Caused an ERROR > javax/xml/bind/DatatypeConverter > java.lang.NoClassDefFoundError: javax/xml/bind/DatatypeConverter This is the deprecated WebSocket implementation referencing a deprecated utility class. This issue only affects Tomcat 7 (the code in question was removed in 8.x). I've applied a fix for this to svn. > Testcase: testBug53339 took 0.202 sec > FAILED This is passing for me. > - org.apache.tomcat.websocket.TestWebSocketFrameClientSSL > > Failing sporadically on tc9.0.x for nio2 with Java 1.8.0, here for RHEL7 > and Solaris 10 Sparc Needs further investigation. I have added a TODO. > TLS > --- > > - org.apache.tomcat.util.net.TestSsl > Only failing for tc7.0.x, RHEL7+SLES12+Solaris 10 Sparc, Java 11+1.8.0 > (not 1.7.0), bio+nio: Can't repeat these on Ubuntu. > - org.apache.tomcat.util.net.TestClientCert > > Only tc7.0.x, RHEL7+SLES12+Solaris 10 Sparc, Java 11+1.8.0 (not 1.7.0), > bio (not nio): Can't repeat these on Ubuntu. > - org.apache.tomcat.util.net.TestCustomSsl > Only tc7.0.x, RHEL7+SLES12+Solaris 10 Sparc, Java 11+1.8.0 (not 1.7.0), > bio (not nio): Can't repeat these on Ubuntu. > - org.apache.tomcat.util.net.TestClientCertTls13 > Only tc7.0.x, RHEL7+SLES12, only Java 11 but bio+nio: I see these locally. Working on a fix now. > - ciphers tests > Failing for RHEL7 and SLES12 on tc8.5.x and tc9.0.x nio+nio2, > any tested Java version: > org.apache.tomcat.util.net.openssl.ciphers.TestOpenSSLCipherConfigurationParser > > org.apache.tomcat.util.net.openssl.ciphers.TestCipher > > Probably false positive, because no special OpenSSL version was given > for the test, so using platform openssl. Agreed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Jakarta EE - WebSocket TCK (nightly)
On Thu, Jan 31, 2019 at 8:09 PM Mark Thomas wrote: > On 31/01/2019 16:31, Mark Thomas wrote: > > On 31/01/2019 15:58, Rémy Maucherat wrote: > >> On Wed, Jan 30, 2019 at 8:37 PM Mark Thomas wrote: > >> > >>> A few failures on this one. I'm tracking progress here: > >>> > >>> https://cwiki.apache.org/confluence/display/TOMCAT/WebSocket+TCK > >>> > >>> > >>> Score so far is: > >>> 1 TCK bug > >>> 38 TBD > >>> > >>> A lot of the TBD appear to have the same root cause so hopefully that > >>> number will come down quickly. > >>> > >> > >> Running the TCK too now. > >> > >> The very last commit is broken (to be honest, I don't understand the > >> meaning of the spec language regarding these negdep tests failures, I > guess > >> there were fewer of these when I last looked at it and I didn't have the > >> problem). > > > > Whoops. I'll take a look. > > Fixed. Sorry for the noise. > > >> I had four issues then that appear to be fixed (three fixes and one test > >> gone, which was > >> com.sun.ts.tests.websocket.ee > .javax.websocket.handshakeresponse.getHeadersHasOriginTest). > >> com/sun/ts/tests/websocket/ee/javax/websocket/session/setTimeout1Test > >> doesn't pass for me at the moment, although you put in your wiki it is > >> fixed. > > > > I'm not 100% sure on that. It might be intermittent. Once I'd been > > through everything once, I was going to do a full run and see where > > things stand. > > Got to the bottom of that one (and 2 others). It was related to how > quickly we checked for session timeout. The default is every 10s which > isn't fast enough for those tests. I've added a system property to > reduce it to every second and that fixes them. > Hum, right, I think I remember that one now. It was a while ago. > > > Having looked at some of the TCK tests I am more in favour of making > > some of the changes I was previously opposed to. Again, I was planning > > on coming back to this after I'd done a new full run. > > Starting the full run now... > > Assuming it takes as long to run as it did last time (~2 hours) I'll > come back to this tomorrow. > So it's all good sorted out now, except the concurrency problem. The spec probably implied concurrency was "ok". Resolving this by waiting for the right state works for me (unsurprisingly), I have a first patch. Note: I cannot edit the confluence, what did I do wrong ? Rémy
Re: Jakarta EE - WebSocket TCK (nightly)
On 01/02/2019 14:41, Rémy Maucherat wrote: > On Thu, Jan 31, 2019 at 8:09 PM Mark Thomas wrote: > >> On 31/01/2019 16:31, Mark Thomas wrote: >>> On 31/01/2019 15:58, Rémy Maucherat wrote: On Wed, Jan 30, 2019 at 8:37 PM Mark Thomas wrote: I had four issues then that appear to be fixed (three fixes and one test gone, which was com.sun.ts.tests.websocket.ee >> .javax.websocket.handshakeresponse.getHeadersHasOriginTest). com/sun/ts/tests/websocket/ee/javax/websocket/session/setTimeout1Test doesn't pass for me at the moment, although you put in your wiki it is fixed. >>> >>> I'm not 100% sure on that. It might be intermittent. Once I'd been >>> through everything once, I was going to do a full run and see where >>> things stand. >> >> Got to the bottom of that one (and 2 others). It was related to how >> quickly we checked for session timeout. The default is every 10s which >> isn't fast enough for those tests. I've added a system property to >> reduce it to every second and that fixes them. >> > > Hum, right, I think I remember that one now. It was a while ago. Maybe not. Those two are failing consistently for me now. >> >>> Having looked at some of the TCK tests I am more in favour of making >>> some of the changes I was previously opposed to. Again, I was planning >>> on coming back to this after I'd done a new full run. >> >> Starting the full run now... >> >> Assuming it takes as long to run as it did last time (~2 hours) I'll >> come back to this tomorrow. >> > > So it's all good sorted out now, except the concurrency problem. The spec > probably implied concurrency was "ok". Resolving this by waiting for the > right state works for me (unsurprisingly), I have a first patch. I was thinking along the same lines but I was worried about possible deadlocks. > Note: I cannot edit the confluence, what did I do wrong ? Nothing. You weren't granted edit privs. I've just fixed that. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Jakarta EE - WebSocket TCK (nightly)
On Fri, Feb 1, 2019 at 4:50 PM Mark Thomas wrote:
> On 01/02/2019 14:41, Rémy Maucherat wrote:
> > On Thu, Jan 31, 2019 at 8:09 PM Mark Thomas wrote:
> >
> >> On 31/01/2019 16:31, Mark Thomas wrote:
> >>> On 31/01/2019 15:58, Rémy Maucherat wrote:
> On Wed, Jan 30, 2019 at 8:37 PM Mark Thomas wrote:
>
>
>
>
> I had four issues then that appear to be fixed (three fixes and one
> test
> gone, which was
> com.sun.ts.tests.websocket.ee
> >> .javax.websocket.handshakeresponse.getHeadersHasOriginTest).
> com/sun/ts/tests/websocket/ee/javax/websocket/session/setTimeout1Test
> doesn't pass for me at the moment, although you put in your wiki it is
> fixed.
> >>>
> >>> I'm not 100% sure on that. It might be intermittent. Once I'd been
> >>> through everything once, I was going to do a full run and see where
> >>> things stand.
> >>
> >> Got to the bottom of that one (and 2 others). It was related to how
> >> quickly we checked for session timeout. The default is every 10s which
> >> isn't fast enough for those tests. I've added a system property to
> >> reduce it to every second and that fixes them.
> >>
> >
> > Hum, right, I think I remember that one now. It was a while ago.
>
> Maybe not. Those two are failing consistently for me now.
>
Will have to look at it again then.
>
> >>
> >>> Having looked at some of the TCK tests I am more in favour of making
> >>> some of the changes I was previously opposed to. Again, I was planning
> >>> on coming back to this after I'd done a new full run.
> >>
> >> Starting the full run now...
> >>
> >> Assuming it takes as long to run as it did last time (~2 hours) I'll
> >> come back to this tomorrow.
> >>
> >
> > So it's all good sorted out now, except the concurrency problem. The spec
> > probably implied concurrency was "ok". Resolving this by waiting for the
> > right state works for me (unsurprisingly), I have a first patch.
>
> I was thinking along the same lines but I was worried about possible
> deadlocks.
>
Here's my patch anyway.
Index: java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
===
--- java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(revision 1852757)
+++ java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(working copy)
@@ -1159,32 +1159,32 @@
private State state = State.OPEN;
public synchronized void streamStart() {
-checkState(State.OPEN);
+waitState(State.OPEN);
state = State.STREAM_WRITING;
}
public synchronized void writeStart() {
-checkState(State.OPEN);
+waitState(State.OPEN);
state = State.WRITER_WRITING;
}
public synchronized void binaryPartialStart() {
-checkState(State.OPEN, State.BINARY_PARTIAL_READY);
+waitState(State.OPEN, State.BINARY_PARTIAL_READY);
state = State.BINARY_PARTIAL_WRITING;
}
public synchronized void binaryStart() {
-checkState(State.OPEN);
+waitState(State.OPEN);
state = State.BINARY_FULL_WRITING;
}
public synchronized void textPartialStart() {
-checkState(State.OPEN, State.TEXT_PARTIAL_READY);
+waitState(State.OPEN, State.TEXT_PARTIAL_READY);
state = State.TEXT_PARTIAL_WRITING;
}
public synchronized void textStart() {
-checkState(State.OPEN);
+waitState(State.OPEN);
state = State.TEXT_FULL_WRITING;
}
@@ -1213,6 +1213,23 @@
"BUG: This code should never be called");
}
}
+notify();
+}
+
+private void waitState(State... required) {
+while (true) {
+for (State state : required) {
+if (this.state == state) {
+return;
+}
+}
+try {
+// TODO: timeout and break loop after a while
+wait(1000);
+} catch (InterruptedException e) {
+// Ignore
+}
+}
}
private void checkState(State... required) {
>
> > Note: I cannot edit the confluence, what did I do wrong ?
>
> Nothing. You weren't granted edit privs. I've just fixed that.
>
Ah, I thought anyone could edit it.
Rémy
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
[Tomcat Wiki] Update of "FAQ/CharacterEncoding" by GarretWilson
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "FAQ/CharacterEncoding" page has been changed by GarretWilson: https://wiki.apache.org/tomcat/FAQ/CharacterEncoding?action=diff&rev1=26&rev2=27 Comment: Updated sections related to percent encoding charset of HTML form posts. <>'''Why does everything have to be this way?''' - Everything covered in this page comes down to practical interpretation of a number of specifications. When working with Java servlets, the Java Servlet Specification is the primary reference, but the servlet spec itself relies on older specifications such as HTTP for its foundation. Here are a couple of references before we cover exactly where these items are located in them. + Everything covered in this page comes down to practical interpretation of a number of specifications. When working with Java servlets, the Java Servlet Specification is the primary reference, but the servlet spec itself relies on older specifications such as HTTP for its foundation. Here are a couple of references before we cover exactly where these items are located in them. A more detailed list can be found on the [[https://wiki.apache.org/tomcat/Specifications|Specifications]] page. + 1. [[https://www.jcp.org/en/jsr/detail?id=369|Java Servlet Specification 4.0]] + 1. [[https://tools.ietf.org/html/rfc7230|HTTP 1.1 Protocol: Message Syntax and Routing]], [[https://tools.ietf.org/html/rfc7231|HTTP 1.1 Protocol: Semantics and Content]] … - 1. [[http://jcp.org/aboutJava/communityprocess/mrel/jsr154/index2.html|Java Servlet Specification 2.5]] - 1. [[http://jcp.org/aboutJava/communityprocess/final/jsr154/index.html|Java Servlet Specification 2.4]] - 1. [[http://www.w3.org/Protocols/rfc2616/rfc2616.txt|HTTP 1.1 Protocol]] ([[http://www.w3.org/Protocols/rfc2616/rfc2616.html|hyperlinked version]]) - 1. [[http://www.ietf.org/rfc/rfc2396.txt|URI Syntax]] + 1. [[https://tools.ietf.org/html/rfc3986|URI Syntax]] - 1. [[http://www.w3.org/Protocols/rfc822/|ARPA Internet Text Messages]] + 1. [[https://tools.ietf.org/html/rfc822|ARPA Internet Text Messages]] - 1. [[http://www.w3.org/TR/html4|HTML 4]] + 1. [[https://www.w3.org/TR/html4/|HTML 4]], [[https://www.w3.org/TR/html/|HTML 5]] ''Default encoding for request and response bodies'' @@ -47, +46 @@ ''Default encoding for GET'' - The character set for HTTP query strings (that's the technical term for 'GET parameters') can be found in sections 2 and 2.1 the "URI Syntax" specification. The character set is defined to be [[http://en.wikipedia.org/wiki/ASCII|US-ASCII]]. Any character that does not map to US-ASCII must be encoded in some way. Section 2.1 of the URI Syntax specification says that characters outside of US-ASCII must be encoded using `%` escape sequences: each character is encoded as a literal `%` followed by the two hexadecimal codes which indicate its character code. Thus, `a` (US-ASCII character code 97 = 0x61) is equivalent to `%61`. There ''is no default encoding for URIs'' specified anywhere, which is why there is a lot of confusion when it comes to decoding these values. + The character set for HTTP query strings (that's the technical term for 'GET parameters') can be found in sections 2 and 2.1 the "URI Syntax" specification. The character set is defined to be [[http://en.wikipedia.org/wiki/ASCII|US-ASCII]]. Any character that does not map to US-ASCII must be encoded in some way. Section 2.1 of the URI Syntax specification says that characters outside of US-ASCII must be encoded using `%` escape sequences: each character is encoded as a literal `%` followed by the two hexadecimal codes which indicate its character code. Thus, `a` (US-ASCII character code 97 = 0x61) is equivalent to `%61`. Although the URI specification does not mandate a default encoding for percent-encoded octets, it recommends UTF-8 especially for new URI schemes, and most modern user agents have settled on UTF-8 for percent-encoding URI characters. Some notes about the character encoding of URIs: - 1. ISO-8859-1 and ASCII are compatible for character codes 0x20 to 0x7E, so they are often used interchangeably. Most of the web uses ISO-8859-1 as the default for query strings. + 1. ISO-8859-1 and ASCII are compatible for character codes 0x20 to 0x7E, so they are often used interchangeably. - 1. Many browsers are starting to offer (default) options of encoding URIs using UTF-8 instead of ISO-8859-1. Some browsers appear to use the encoding of the current page to encode URIs for links (see the note above regarding browser behavior for POST encoding). + 1. Modern browsers encoding URIs using UTF-8. Some browsers appear to use the encoding of the current page to encode URIs for links. - 1. [[http://www.w3.org/TR/html40/appendix/notes.html#non-ascii-chars|HTML 4.0]] recommends the use of UTF-8 to encode the query string. + 1. [[https:/
[Tomcat Wiki] Update of "FAQ/CharacterEncoding" by GarretWilson
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "FAQ/CharacterEncoding" page has been changed by GarretWilson: https://wiki.apache.org/tomcat/FAQ/CharacterEncoding?action=diff&rev1=27&rev2=28 Comment: Clarified legacy percent encoding of form submissions in HTML 4.01. ''Percent Encoding for `application/x-www-form-urlencoded`'' - The [[https://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.1|HTML 4.0.1]] specification indicated that percent-encoding of non-ASCII characters of `application/x-www-form-urlencoded` (the default content type for HTML form submissions) should be performed using `US-ASCII` byte sequences. However [[https://url.spec.whatwg.org/#concept-urlencoded-serializer|HTML 5]] changed this to use UTF-8 byte sequences, matching the modern percent encoding for URLs. Modern browsers therefore percent-encode UTF-8 sequences when submitting forms using `application/x-www-form-urlencoded`. + The [[https://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.1|HTML 4.01]] specification indicated that percent-encoding of any non alphanumeric characters of `application/x-www-form-urlencoded` (the default content type for HTML form submissions) should be performed using `US-ASCII` byte sequences. However [[https://url.spec.whatwg.org/#concept-urlencoded-serializer|HTML 5]] changed this to use UTF-8 byte sequences, matching the modern percent encoding for URLs. Modern browsers therefore percent-encode UTF-8 sequences when submitting forms using `application/x-www-form-urlencoded`. The servlet specification, however, requires servlet containers to interpret percent-encoded sequences in `application/x-www-form-urlencoded` as `ISO-8859-1`, which in a default configuration will result in corrupted content because of the charset mismatch. See below for how this can be reconfigured in Tomcat. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat-embed-core-9.0.12.jar bug about Content-Length Corrupting Parsing logic for Subsequent Request
Hello Tomcat Developers,
I have a unique situation about HTTP Protocol PAYLOAD parsing and
Content-Length Header. When PUT/POST Content-Length is NOT correct (client
send wrong Content-Lenght), the tomcat is able to parse the request and
respond to request with 2xx but subsequent on SAME TCP connection fails
with corrupted HTTP HEADER.
For example, I do following raw HTTP Request to tomcat server with
Content-Lenght: 419 (but Client Does not POST content followed by GET
request it get corrupted) : If Content-Length is zero for PUT then
request works. I am attaching sample Spring boot App to reproduce
this issue. With text file and command ( *cat file | nc localhost 8448*)
Please get back to me ASAP. Should I file a bug ?
*REQUEST:*
PUT /api/?msg=Test HTTP/1.1
User-Agent: Java/1.8.0_131
X-Real-IP: 96.118.243.182
id: 924
ACCESS_TOKEN:
30005f625a9401b4f604d95f9c4bdb4451e5f55d6477a8fd7c6524e2a955179a
breadcrumbId:
ID-vd01-ch2-g-CHCIILNQL06-dse-comcast-net-43208-1546458662158-9-601484
Accept: application/json
CLIENT_IP: 96.119.84.25
usercontext:
eyJ1c2VyTmFtZSI6Im5jc28iLCJ1c2VyUm9sZXMiOlsiUHJvdmlkZXJEYXRhQ2VudGVyQWRtaW4iXSwidGVuYW50TmFtZSI6IiJ9
X-Forwarded-For: 96.118.243.182
X-Forwarded-Proto: https
URI: /nextgen/templates/template-metadata/PostStaging-LBNNPACB81W/override
HTTP_METHOD: PUT
rollback-label: b3f8ec56-33b1-4b27-a64e-5c3d77041332
rollback-comment: ServiceTemplate_b3f8ec56-33b1-4b27-a64e-5c3d77041332
Content-Length: 419
Content-Type: application/json
Host: localhost:8448
Conection: Keep-Alive
GET /api/ HTTP/1.1
HTTP_METHOD: GET
X-Forwarded-For: 96.118.243.182
ACCESS_TOKEN:
30005f625a9401b4f604d95f9c4bdb4451e5f55d6477a8fd7c6524e2a955179a
X-Real-IP: 96.118.243.182
X-Forwarded-Proto: https
breadcrumbId:
ID-vd01-ch2-g-CHCIILNQL06-dse-comcast-net-43208-1546458662158-9-601497
override: override-with-referred-template
User-Agent: Java/1.8.0_131
rollback-label: adfb0689-062d-48a2-95ca-f8a9711858f7
Accept: application/json
CLIENT_IP: 96.119.84.25
usercontext:
eyJ1c2VyTmFtZSI6Im5jc28iLCJ1c2VyUm9sZXMiOlsiUHJvdmlkZXJEYXRhQ2VudGVyQWRtaW4iXSwidGVuYW50TmFtZSI6IiJ9
URI:
/nextgen/binddata/templateData/template/PostStaging-LBNNPACB81W/devicegroup/DeviceGroup-LBNNPACB81W
rollback-comment: ServiceTemplate_adfb0689-062d-48a2-95ca-f8a9711858f7
Host: localhost:8448
Connection: Keep-Alive
*RESPONSE:*BMs-MacBook-Pro:gs-spring-boot bmistry$ *cat /tmp/testbody.txt |
nc localhost 8448*
HTTP/1.1 200
Content-Type: application/json;charset=UTF-8
Content-Length: 34
Date: Fri, 01 Feb 2019 19:39:20 GMT
Greetings from Spring Boot ! Test
HTTP/1.1 400
Content-Type: text/html;charset=utf-8
Content-Language: en
Content-Length: 800
Date: Fri, 01 Feb 2019 19:39:20 GMT
Connection: close
HTTP Status 400 – Bad
Requesth1
{font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
h2
{font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;}
h3
{font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;}
body
{font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} b
{font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;}
p
{font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}
a {color:black;} a.name {color:black;} .line
{height:1px;background-color:#525D76;border:none;}HTTP
Status 400 – Bad RequestBMs-MacBook-Pro:gs-spring-boot
bmistry$
*ERROR LOGS:*
2019-02-01 11:39:20.387 DEBUG 14931 --- [nio-8448-exec-5]
o.a.coyote.http11.Http11InputBuffer : Received [PUT /api/?msg=Test
HTTP/1.1
User-Agent: Java/1.8.0_131
X-Real-IP: 96.118.243.182
id: 924
ACCESS_TOKEN:
30005f625a9401b4f604d95f9c4bdb4451e5f55d6477a8fd7c6524e2a955179a
breadcrumbId:
ID-vd01-ch2-g-CHCIILNQL06-dse-comcast-net-43208-1546458662158-9-601484
Accept: application/json
CLIENT_IP: 96.119.84.25
usercontext:
eyJ1c2VyTmFtZSI6Im5jc28iLCJ1c2VyUm9sZXMiOlsiUHJvdmlkZXJEYXRhQ2VudGVyQWRtaW4iXSwidGVuYW50TmFtZSI6IiJ9
X-Forwarded-For: 96.118.243.182
X-Forwarded-Proto: https
URI: /nextgen/templates/template-metadata/PostStaging-LBNNPACB81W/override
HTTP_METHOD: PUT
rollback-label: b3f8ec56-33b1-4b27-a64e-5c3d77041332
rollback-comment: ServiceTemplate_b3f8ec56-33b1-4b27-a64e-5c3d77041332
Content-Length: 419
Content-Type: application/json
Host: localhost:8448
Conection: Keep-Alive
GET /api/ HTTP/1.1
HTTP_METHOD: GET
X-Forwarded-For: 96.118.243.182
ACCESS_TOKEN:
30005f625a9401b4f604d95f9c4bdb4451e5f55d6477a8fd7c6524e2a955179a
X-Real-IP: 96.118.243.182
X-Forwarded-Proto: https
breadcrumbId:
ID-vd01-ch2-g-CHCIILNQL06-dse-comcast-net-43208-1546458662158-9-601497
override: override-with-referred-template
User-Agent: Java/1.8.0_131
rollback-label: adfb0689-062d-48a2-95ca-f8a9711858f7
Accept: application/json
CLIENT_IP: 96.119.84.25
usercontext:
eyJ1c2VyTmFtZSI6Im5jc28iLCJ1c2VyUm9sZXMiOlsiUHJvdmlkZXJEYXRhQ2VudGVyQWRtaW4iXSwidGVuYW50TmFtZSI6IiJ9
URI:
/nextgen/binddata/templateData/template/PostS
Re: Tomcat-embed-core-9.0.12.jar bug about Content-Length Corrupting Parsing logic for Subsequent Request
On 01/02/2019 20:10, Bhavesh Mistry wrote: > Hello Tomcat Developers, > > I have a unique situation about HTTP Protocol PAYLOAD parsing and > Content-Length Header. When PUT/POST Content-Length is NOT correct (client > send wrong Content-Lenght), the tomcat is able to parse the request and > respond to request with 2xx but subsequent on SAME TCP connection fails > with corrupted HTTP HEADER. That is expected behaviour when you have a broken client. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat-embed-core-9.0.12.jar bug about Content-Length Corrupting Parsing logic for Subsequent Request
Hi Mark, Thank you very much for your answer. The server should reset the wrong request which PUT with Wrong Content-Length and not GET. We have been using Jetty for our server --> Apache Camel Proxy --> Spring boot. Jetty handle this gracefully. Spring boot (embedded tomcat does not). Is this correct behavior as expected? Thanks, Bhavesh On Fri, Feb 1, 2019 at 12:20 PM Mark Thomas wrote: > On 01/02/2019 20:10, Bhavesh Mistry wrote: > > Hello Tomcat Developers, > > > > I have a unique situation about HTTP Protocol PAYLOAD parsing and > > Content-Length Header. When PUT/POST Content-Length is NOT correct > (client > > send wrong Content-Lenght), the tomcat is able to parse the request and > > respond to request with 2xx but subsequent on SAME TCP connection fails > > with corrupted HTTP HEADER. > > That is expected behaviour when you have a broken client. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: Tomcat-embed-core-9.0.12.jar bug about Content-Length Corrupting Parsing logic for Subsequent Request
Hi Mark, *Correction!* Thank you very much for your answer. The server should **reject** the wrong request which PUT with Wrong Content-Length and not GET request. We have been using Jetty for our server --> Apache Camel Proxy --> Spring boot. Jetty handle this gracefully. Spring boot (embedded tomcat does not). Is this correct behavior as expected? Thanks, Bhavesh On Fri, Feb 1, 2019 at 12:30 PM Bhavesh Mistry wrote: > Hi Mark, > > Thank you very much for your answer. The server should reset the wrong > request which PUT with Wrong Content-Length and not GET. > > We have been using Jetty for our server --> Apache Camel Proxy --> Spring > boot. Jetty handle this gracefully. Spring boot (embedded tomcat does > not). > > Is this correct behavior as expected? > > Thanks, > Bhavesh > > On Fri, Feb 1, 2019 at 12:20 PM Mark Thomas wrote: > >> On 01/02/2019 20:10, Bhavesh Mistry wrote: >> > Hello Tomcat Developers, >> > >> > I have a unique situation about HTTP Protocol PAYLOAD parsing and >> > Content-Length Header. When PUT/POST Content-Length is NOT correct >> (client >> > send wrong Content-Lenght), the tomcat is able to parse the request and >> > respond to request with 2xx but subsequent on SAME TCP connection fails >> > with corrupted HTTP HEADER. >> >> That is expected behaviour when you have a broken client. >> >> Mark >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >>
svn commit: r1852772 - in /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net: TestClientCertTls13.java TesterSupport.java
Author: markt
Date: Fri Feb 1 20:40:46 2019
New Revision: 1852772
URL: http://svn.apache.org/viewvc?rev=1852772&view=rev
Log:
Fix failing TLS 1.3 test with Java 11
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java?rev=1852772&r1=1852771&r2=1852772&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCertTls13.java
Fri Feb 1 20:40:46 2019
@@ -75,8 +75,8 @@ public class TestClientCertTls13 extends
// Need to override some of the previous settings
tomcat.getConnector().setProperty("sslEnabledProtocols",
Constants.SSL_PROTO_TLSv1_3);
// And add force authentication to occur on the initial handshake
-tomcat.getConnector().setProperty("clientAuth", "required");
-
-TesterSupport.configureClientSsl();
+tomcat.getConnector().setProperty("clientAuth", "true");
+// Force client to use TLS 1.3
+TesterSupport.configureClientSsl("TLSv1.3");
}
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1852772&r1=1852771&r2=1852772&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Fri
Feb 1 20:40:46 2019
@@ -176,8 +176,13 @@ public final class TesterSupport {
protected static void configureClientSsl() {
+configureClientSsl("TLSv1");
+}
+
+
+protected static void configureClientSsl(String protocol) {
try {
-System.setProperty("https.protocols", "TLSv1");
+System.setProperty("https.protocols", protocol);
SSLContext sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
sc.init(TesterSupport.getUser1KeyManagers(),
TesterSupport.getTrustManagers(),
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat-embed-core-9.0.12.jar bug about Content-Length Corrupting Parsing logic for Subsequent Request
On 01/02/2019 20:33, Bhavesh Mistry wrote: > Hi Mark, > > *Correction!* > > Thank you very much for your answer. The server should **reject** the > wrong request which PUT with Wrong Content-Length and not GET request. > > We have been using Jetty for our server --> Apache Camel Proxy --> Spring > boot. Jetty handle this gracefully. Spring boot (embedded tomcat does > not). > > Is this correct behavior as expected? Please take this to the users list. Note the mailing lists drop most attachments. Mark > > Thanks, > Bhavesh > > On Fri, Feb 1, 2019 at 12:30 PM Bhavesh Mistry > wrote: > >> Hi Mark, >> >> Thank you very much for your answer. The server should reset the wrong >> request which PUT with Wrong Content-Length and not GET. >> >> We have been using Jetty for our server --> Apache Camel Proxy --> Spring >> boot. Jetty handle this gracefully. Spring boot (embedded tomcat does >> not). >> >> Is this correct behavior as expected? >> >> Thanks, >> Bhavesh >> >> On Fri, Feb 1, 2019 at 12:20 PM Mark Thomas wrote: >> >>> On 01/02/2019 20:10, Bhavesh Mistry wrote: Hello Tomcat Developers, I have a unique situation about HTTP Protocol PAYLOAD parsing and Content-Length Header. When PUT/POST Content-Length is NOT correct >>> (client send wrong Content-Lenght), the tomcat is able to parse the request and respond to request with 2xx but subsequent on SAME TCP connection fails with corrupted HTTP HEADER. >>> >>> That is expected behaviour when you have a broken client. >>> >>> Mark >>> >>> - >>> 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: r1852774 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoaderBase.java webapps/docs/changelog.xml
Author: markt
Date: Fri Feb 1 21:23:31 2019
New Revision: 1852774
URL: http://svn.apache.org/viewvc?rev=1852774&view=rev
Log:
If the resources for a web application have been configured with multiple
locations mapped to /WEB-INF/classes, ensure that all of those locations are
used when building the web application class path.
Patch provided by Marcin Gołębski.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1852774&r1=1852773&r2=1852774&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Fri
Feb 1 21:23:31 2019
@@ -1519,9 +1519,11 @@ public abstract class WebappClassLoaderB
state = LifecycleState.STARTING_PREP;
-WebResource classes = resources.getResource("/WEB-INF/classes");
-if (classes.isDirectory() && classes.canRead()) {
-localRepositories.add(classes.getURL());
+WebResource[] classesResources =
resources.getResources("/WEB-INF/classes");
+for (WebResource classes : classesResources) {
+if (classes.isDirectory() && classes.canRead()) {
+localRepositories.add(classes.getURL());
+}
}
WebResource[] jars = resources.listResources("/WEB-INF/lib");
for (WebResource jar : jars) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1852774&r1=1852773&r2=1852774&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Feb 1 21:23:31 2019
@@ -137,6 +137,13 @@
Update the recommended minimum Tomcat Native version to 1.2.21. (markt)
+
+63137: If the resources for a web application have been
+configured with multiple locations mapped to
+/WEB-INF/classes, ensure that all of those locations are
+used when building the web application class path. Patch provided by
+Marcin GoÅÄbski. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1852775 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoaderBase.java webapps/docs/changelog.xml
Author: markt Date: Fri Feb 1 21:24:11 2019 New Revision: 1852775 URL: http://svn.apache.org/viewvc?rev=1852775&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63137 If the resources for a web application have been configured with multiple locations mapped to /WEB-INF/classes, ensure that all of those locations are used when building the web application class path. Patch provided by Marcin Gołębski. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 1 21:24:11 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,176
[Bug 63137] Ignored second (and next) resources mapped in webAppMount="/WEB-INF/classes" using DirResourceSet
https://bz.apache.org/bugzilla/show_bug.cgi?id=63137 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report and especially for the patch. Fixed in: - trunk for 9.0.15 onwards - 8.5.x for 8.5.38 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
