[Bug 62596] WsWebSocketContainer#connectToServer throws BufferOverflowException

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62596

--- Comment #2 from erik.mccal...@edge-technologies.com ---
That makes sense.

-- 
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



buildbot success in on tomcat-7-trunk

2018-08-07 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1154

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1837619
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1837619 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2018-08-07 Thread markt
Author: markt
Date: Tue Aug  7 21:23:55 2018
New Revision: 1837619

URL: http://svn.apache.org/viewvc?rev=1837619=rev
Log:
Fix back-port (remove use of Java 8 method)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  7 21:23:55 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 

svn commit: r1837618 - /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

2018-08-07 Thread markt
Author: markt
Date: Tue Aug  7 21:22:51 2018
New Revision: 1837618

URL: http://svn.apache.org/viewvc?rev=1837618=rev
Log:
Fix back-port (remove use of Java 8 method)

Modified:

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1837618=1837617=1837618=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
 Tue Aug  7 21:22:51 2018
@@ -64,12 +64,15 @@ public class TestWebSocketFrameClient ex
 WebSocketContainer wsContainer = 
ContainerProvider.getWebSocketContainer();
 
 // BZ 62596
+final StringBuilder dummyValue = new StringBuilder(4000);
+for (int i = 0; i < 4000; i++) {
+dummyValue.append('A');
+}
 ClientEndpointConfig clientEndpointConfig =
 ClientEndpointConfig.Builder.create().configurator(new 
Configurator() {
 @Override
 public void beforeRequest(Map> 
headers) {
-headers.put("Dummy", Collections.singletonList(
-String.join("", Collections.nCopies(4000, 
"A";
+headers.put("Dummy", 
Collections.singletonList(dummyValue.toString()));
 super.beforeRequest(headers);
 }
 }).build();



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: buildbot failure in on tomcat-7-trunk

2018-08-07 Thread Mark Thomas

Sorry. IDE /JDKs not configured correctly. Working on a fix now...

Mark


On 07/08/2018 21:35, build...@apache.org wrote:

The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building . Full details are available at:
 https://ci.apache.org/builders/tomcat-7-trunk/builds/1153

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1837615
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
  -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62605] New: Async servlet over HTTP/2 setReadListener does not work if post request data arrives much later than headers

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62605

Bug ID: 62605
   Summary: Async servlet over HTTP/2 setReadListener does not
work if post request data arrives much later than
headers
   Product: Tomcat 9
   Version: 9.0.10
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Servlet
  Assignee: dev@tomcat.apache.org
  Reporter: zdap...@google.com
  Target Milestone: -

[Previously I filed an invalid bug
https://bz.apache.org/bugzilla/show_bug.cgi?id=62569 , which was not producible
with telnet client over HTTP/1.1, sorry about that]

The issue is reproducible when using client over HTTP/2

Steps to reproduce:

1. Enable HTTP/2 for Tomcat




2. Deploy the following Servlet (basically the same as the tutorial example
https://javaee.github.io/tutorial/servlets013.html with more debug info and
fixing reading EOS problem)

@WebServlet(urlPatterns={"/asyncioservlet"}, asyncSupported=true)
public class AsyncIOServlet extends HttpServlet {
  @Override
  public void doPost(HttpServletRequest request,
  HttpServletResponse response)
  throws IOException {
final AsyncContext acontext = request.startAsync();
final ServletInputStream input = request.getInputStream();

System.out.println("Set listener");
input.setReadListener(
new ReadListener() {
  byte buffer[] = new byte[4 * 1024];
  StringBuilder sbuilder = new StringBuilder();

  @Override
  public void onDataAvailable() {
System.out.println("onDataAvailable");
try {
  do {
int length = input.read(buffer);
System.out.println("length = " + length);
if (length == -1) {
  return;
}
sbuilder.append(new String(buffer, 0, length));
  } while (input.isReady());
} catch (IOException ex) {
  ex.printStackTrace();
} catch (RuntimeException e) {
  e.printStackTrace();
}
  }

  @Override
  public void onAllDataRead() {
System.out.println("onAllDataRead");
try {
  acontext.getResponse().getWriter().write("...the response...");
} catch (IOException ex) {
  ex.printStackTrace();
}
acontext.complete();
  }

  @Override
  public void onError(Throwable t) {
t.printStackTrace();
  }
});
System.out.println("Set listener - done");
  }

3. Make sure the curl command supports HTTP/2
$ curl --version
curl 7.60.0
Features: AsynchDNS IDN IPv6 Largefile GSS-API Kerberos SPNEGO NTLM NTLM_WB SSL
libz TLS-SRP HTTP2 UnixSockets HTTPS-proxy PSL

4. Run the following curl command 
$ (sleep 2s; echo "hello world") | curl --http2 --http2-prior-knowledge
http://localhost:8080/asyncioservlet -H "content-type: text/plain" -T - -X POST

(for TLS use the following command, I didn't check the TLS case though)
$ (sleep 2s; echo "hello world") | curl --http2 --http2-prior-knowledge
https://localhost:8443/asyncioservlet -H "content-type: text/plain" -T - -X
POST -k

5. The client will hang, and check the server log "logs/catalina.out"
Set listener
Set listener - done

no sign of ReadListener callbacks invoked.

6. Without the sleep, the client does not hang, and ReadListener callbacks get
invoked.

Deploying the same servlet to Glassfish/Undertow/Jetty will not see this
problem.

-- 
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



buildbot failure in on tomcat-7-trunk

2018-08-07 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1153

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1837615
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1837615 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsWebSocketContainer.java test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java webapps/docs/changelog.xml

2018-08-07 Thread markt
Author: markt
Date: Tue Aug  7 20:22:28 2018
New Revision: 1837615

URL: http://svn.apache.org/viewvc?rev=1837615=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62596
Remove the limit on the size of the initial HTTP upgrade request used to 
establish the web socket connection.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  7 20:22:28 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 

svn commit: r1837614 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/websocket/WsWebSocketContainer.java test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java webapps/docs/changelog.xml

2018-08-07 Thread markt
Author: markt
Date: Tue Aug  7 20:19:45 2018
New Revision: 1837614

URL: http://svn.apache.org/viewvc?rev=1837614=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62596
Remove the limit on the size of the initial HTTP upgrade request used to 
establish the web socket connection.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  7 20:19:45 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

svn commit: r1837613 - in /tomcat/trunk: java/org/apache/tomcat/websocket/WsWebSocketContainer.java test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java webapps/docs/changelog.xml

2018-08-07 Thread markt
Author: markt
Date: Tue Aug  7 20:18:51 2018
New Revision: 1837613

URL: http://svn.apache.org/viewvc?rev=1837613=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62596
Remove the limit on the size of the initial HTTP upgrade request used to 
establish the web socket connection.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1837613=1837612=1837613=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Tue 
Aug  7 20:18:51 2018
@@ -733,7 +733,7 @@ public class WsWebSocketContainer implem
 
 // Headers
 for (Entry> entry : reqHeaders.entrySet()) {
-addHeader(result, entry.getKey(), entry.getValue());
+result = addHeader(result, entry.getKey(), entry.getValue());
 }
 
 // Terminating CRLF
@@ -745,15 +745,34 @@ public class WsWebSocketContainer implem
 }
 
 
-private static void addHeader(ByteBuffer result, String key, List 
values) {
+private static ByteBuffer addHeader(ByteBuffer result, String key, 
List values) {
 if (values.isEmpty()) {
-return;
+return result;
 }
 
-result.put(key.getBytes(StandardCharsets.ISO_8859_1));
-result.put(": ".getBytes(StandardCharsets.ISO_8859_1));
-
result.put(StringUtils.join(values).getBytes(StandardCharsets.ISO_8859_1));
-result.put(CRLF);
+result = putWithExpand(result, 
key.getBytes(StandardCharsets.ISO_8859_1));
+result = putWithExpand(result, ": 
".getBytes(StandardCharsets.ISO_8859_1));
+result = putWithExpand(result, 
StringUtils.join(values).getBytes(StandardCharsets.ISO_8859_1));
+result = putWithExpand(result, CRLF);
+
+return result;
+}
+
+
+private static ByteBuffer putWithExpand(ByteBuffer input, byte[] bytes) {
+if (bytes.length > input.remaining()) {
+int newSize;
+if (bytes.length > input.capacity()) {
+newSize = 2 * bytes.length;
+} else {
+newSize = input.capacity() * 2;
+}
+ByteBuffer expanded = ByteBuffer.allocate(newSize);
+input.flip();
+expanded.put(input);
+input = expanded;
+}
+return input.put(bytes);
 }
 
 

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1837613=1837612=1837613=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java 
Tue Aug  7 20:18:51 2018
@@ -17,11 +17,15 @@
 package org.apache.tomcat.websocket;
 
 import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import javax.websocket.ClientEndpointConfig;
+import javax.websocket.ClientEndpointConfig.Configurator;
 import javax.websocket.ContainerProvider;
 import javax.websocket.Session;
 import javax.websocket.WebSocketContainer;
@@ -57,10 +61,19 @@ public class TestWebSocketFrameClient ex
 
 tomcat.start();
 
-WebSocketContainer wsContainer =
-ContainerProvider.getWebSocketContainer();
+WebSocketContainer wsContainer = 
ContainerProvider.getWebSocketContainer();
+
+// BZ 62596
 ClientEndpointConfig clientEndpointConfig =
-ClientEndpointConfig.Builder.create().build();
+ClientEndpointConfig.Builder.create().configurator(new 
Configurator() {
+@Override
+public void beforeRequest(Map> 
headers) {
+headers.put("Dummy", Collections.singletonList(
+String.join("", Collections.nCopies(4000, 
"A";
+super.beforeRequest(headers);
+}
+}).build();
+
 Session wsSession = wsContainer.connectToServer(
 TesterProgrammaticEndpoint.class,
 clientEndpointConfig,

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837613=1837612=1837613=diff

[Bug 62596] WsWebSocketContainer#connectToServer throws BufferOverflowException

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62596

--- Comment #1 from Mark Thomas  ---
I'm leaning more towards simply auto-expanding the buffer until it is big
enough. I'm not concerned about memory issues as the user is in control of the
headers they send.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62603] New: Changes in tag files are not reflected in the rendered view or they end up with a java.lang.NoClassDefFoundError

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62603

Bug ID: 62603
   Summary: Changes in tag files are not reflected in the rendered
view or they end up with a
java.lang.NoClassDefFoundError
   Product: Tomcat 8
   Version: 8.5.24
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: jlla...@gmail.com
  Target Milestone: 

We have an application that contains jsps and tag files, when we deploy jsp/tag
changes instead of reloading the webapp entirely we change those in the webapps
folder, and let jsp reloading process do the work for us. 

>From time to time, we suffer from two different kind of errors:

1- java.lang.NoClassDefFoundError because the tag file used in a jsp is "not
found", but the jsp and also the tag file are there
(TOMCA_HOME/work/Catalina/localhost/ROOT/org/apache/jsp/...)

2- changes in a tag file are never reflected in the rendered view(jsp)


I've took some time to debug the jsp reloading code, and here are my thoughts

Jsp reloading process at the end is calling JspServlet.periodicEvent method
which triggers the process by calling JspRuntimeContext's checkUnload and
checkCompile methods

JspRuntimeContext's jsps attribute is the one that contains jsps and tag
references that are going to be checked from time to time, depending on
checkInterval and development config values, to see if a JSP page (and its
dependent files) need to be recompiled.

JspRuntimeContext's jsps attribute is backed by a ConcurrentHashMap, so the
insertion order MAY NOT be preserved when we iterate through the list of jsps
and dependant files. Check JspRuntimeContext.checkCompile() method.

The order in which we iterate through the tags and jsps is relevant because
when a change in a tag file is detected the .java and also .class files are
generated and its JspServletWrapper.reload attribute is set to true, afterwards
in the same JspRuntimeContext.checkCompile() loop, when the process detects
that a jsp needs to be recompiled because is "dependant" on this tag file 
TagFileProcessor.loadTagFile method will invoke the
JspServletWrapper.loadTagFile method that belongs to the modified tag, and
because its reload attribute was set to true JSpServletWrapper's tagHandler
attribute will be loaded again. After this process the .java and .class file
that belong to that jsp will be generated 

But what would happen if we :
- detect a change in the jsp first and generate the .java and .class files (jsp
needs to be recompiled because of a change in one dependant tag). 
- receive a request that match that jsp which will set JspServletWrapper.reload
attribute(set to true in the previous step) to false while still "pointing" to
the old tag class
- detect the change in the tag file which will recreate .java and .class files

Then, depending on the order of the incoming request and the jsp detection
process :
- tag changes are not reflected in the rendered view
- or even worse java.lang.NoClassDefFoundError

Sorry for this long description but it's not easy to explain :)

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62569] Async servlet setReadListener does not work if post request data arrives much later than headers

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62569

--- Comment #2 from Dapeng Zhang  ---
My mistake. This does work. Sorry about that. But I do have some issues that
ReadListener and WriteListener callbacks never get called when using http/2
(https://github.com/grpc/grpc-java/pull/4738). Will update once I find a easy
way to reproduce 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



[Bug 62569] Async servlet setReadListener does not work if post request data arrives much later than headers

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62569

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
This works for me. Note that the example is buggy - it does not handle the "-1"
value returned by read when EOF is reached.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62561] class-loader-howto.html does not mention server.loader and shared.loader from catalina.properties

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62561

--- Comment #8 from Konstantin Kolinko  ---
One minor detail that may be added:
IIRC, Web applications that are configured with  do
not use the "Shared" classloader but use the "Server" one.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62539] WsSession cannot be GC while send close message timeout

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62539

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEW |RESOLVED

--- Comment #4 from Mark Thomas  ---
I can't reproduced the issue with a Tomcat unit test and inspection of the
provided test case indicates that there is a memory leak in the provided test
case.

WebSocketServer.onMessage(String message, Session session) never exits. Hence
the WebSocket session will be pinned in memory even after the session has been
closed. The while loop should be constructed in such a way that the loop exists
once the session is closed.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62539] WsSession cannot be GC while send close message timeout

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62539

--- Comment #3 from Mark Thomas  ---
The test applications provided are far from the simplest possible - both being
full Spring Boot applications. Further, the server application fails to build.

I've looked at the source and the test case is very similar to some existing
Tomcat test cases. I've tried to recreate the reported issue with the existing
test cases without any success.

The next step is to try and create a Tomcat 'unit' test that mirrors the
provided test applications.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62561] class-loader-howto.html does not mention server.loader and shared.loader from catalina.properties

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62561

--- Comment #7 from Michael Osipov <1983-01...@gmx.net> ---
(In reply to Mark Thomas from comment #6)
> Fixed in:
> - trunk for 9.0.11 onwards
> - 8.5.x for 8.5.33 onwards
> - 7.0.x for 7.0.91 onwards

That's perfect. Thanks!

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 62561] class-loader-howto.html does not mention server.loader and shared.loader from catalina.properties

2018-08-07 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62561

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #6 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.11 onwards
- 8.5.x for 8.5.33 onwards
- 7.0.x for 7.0.91 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



svn commit: r1837583 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/class-loader-howto.xml

2018-08-07 Thread markt
Author: markt
Date: Tue Aug  7 08:58:06 2018
New Revision: 1837583

URL: http://svn.apache.org/viewvc?rev=1837583=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62561
Add advanced class loader configuration information regarding the use of the 
Server and Shared class loaders to the documentation web application.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  7 08:58:06 2018
@@ -1,3 +1,3 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
 
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
 
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 

svn commit: r1837582 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/class-loader-howto.xml

2018-08-07 Thread markt
Author: markt
Date: Tue Aug  7 08:56:53 2018
New Revision: 1837582

URL: http://svn.apache.org/viewvc?rev=1837582=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62561
Add advanced class loader configuration information regarding the use of the 
Server and Shared class loaders to the documentation web application.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/class-loader-howto.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  7 08:56:53 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
 
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 

svn commit: r1837581 - in /tomcat/trunk/webapps/docs: changelog.xml class-loader-howto.xml

2018-08-07 Thread markt
Author: markt
Date: Tue Aug  7 08:56:13 2018
New Revision: 1837581

URL: http://svn.apache.org/viewvc?rev=1837581=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62561
Add advanced class loader configuration information regarding the use of the 
Server and Shared class loaders to the documentation web application.

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/class-loader-howto.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837581=1837580=1837581=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Aug  7 08:56:13 2018
@@ -168,6 +168,11 @@
   
 Add documents for Static Membership service. (kfujino)
   
+  
+62561: Add advanced class loader configuration information
+regarding the use of the Server and Shared class loaders to the
+documentation web application. (markt)
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=1837581=1837580=1837581=diff
==
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Tue Aug  7 08:56:13 2018
@@ -258,6 +258,34 @@ for further information.
 
 
 
+
+
+A more complex class loader hierarchy may also be configured. See the 
diagram
+below. By default, the Server and Shared
+class loaders are not defined and the simplifed hierarchy shown above is used.
+This more complex hierarchy may be use by defining values for the
+server.loader and/or shared.loader properties in
+conf/catalina.properties.
+
+
+  Bootstrap
+  |
+System
+  |
+Common
+ /  \
+Server  Shared
+ /  \
+   Webapp1  Webapp2 ...
+
+The Server class loader is only visible to Tomcat internals
+and is completely invisible to web applications.
+
+The Shared class loader is visible to all web applications
+and may be used to shared code across all web applications. However, any 
updates
+to this shared code will require a Tomcat restart.
+
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: DBCP2 in Tomcat

2018-08-07 Thread Mark Thomas
On 07/08/18 09:42, jean-frederic clere wrote:
> On 07/08/18 10:10, Mark Thomas wrote:
>> On 07/08/18 08:55, jean-frederic clere wrote:
>>> Hi,
>>>
>>> I just want to ask what is the process, we pick all changes after
>>> commons-dbcp releases a version, or could I pick the actual code?
>>
>> Generally, I keep an eye on DBCP2/Pool2 and pick up the changes from
>> master after I see an issue fixed I think might affect Tomcat users.
>>
>> DBCP2 has recently added support for later JDBC versions so we may need
>> to be careful exactly which branch we pull from going forwards. I'd made
>> a mental note to figure out what we needed to do but hadn't got around
>> to it.
> 
> Someone is chasing me for DBCP-514, DBCP-515 and DBCP-516 that is why I
> am asking.
> 
> commons-dbcp released 2.5.0 which doesn't have those fixes and we are
> based on 2.4.0 in trunk.
> 
> So depending on your investigations we may or may not update to 2.6.0
> once it is released, correct?

I think we'll update to 2.6.0. The question is what do we do if the
addition of the later JBDC methods causes us issues. I think we'll just
need to remove the @Override annotations. If that doesn't work (I can't
think why it wouldn't we'll need to remove some methods.

I'll make sure these updates make it into the next round of Tomcat releases.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: DBCP2 in Tomcat

2018-08-07 Thread jean-frederic clere
On 07/08/18 10:10, Mark Thomas wrote:
> On 07/08/18 08:55, jean-frederic clere wrote:
>> Hi,
>>
>> I just want to ask what is the process, we pick all changes after
>> commons-dbcp releases a version, or could I pick the actual code?
> 
> Generally, I keep an eye on DBCP2/Pool2 and pick up the changes from
> master after I see an issue fixed I think might affect Tomcat users.
> 
> DBCP2 has recently added support for later JDBC versions so we may need
> to be careful exactly which branch we pull from going forwards. I'd made
> a mental note to figure out what we needed to do but hadn't got around
> to it.

Someone is chasing me for DBCP-514, DBCP-515 and DBCP-516 that is why I
am asking.

commons-dbcp released 2.5.0 which doesn't have those fixes and we are
based on 2.4.0 in trunk.

So depending on your investigations we may or may not update to 2.6.0
once it is released, correct?

> 
> Mark
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 


-- 
Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



JDK 11 , JDK 12 and JDK 8u192 Early Access builds are available on jdk.java.net

2018-08-07 Thread Rory O'Donnell

Hi Mark,

*JDK 11 Early Access  build 25 is available at : - **jdk.java.net/11/*

 * *JDK 11 entered Rampdown Phase 2 on 26-July [1]*
 o The overall feature set is frozen. No further JEPs will be
   targeted to this release.
 o We now turn our focus to P1 and P2 bugs.
 * Release notes are available here  [2]

*JDK 12 Early Access  build 05 is available at : - **jdk.java.net/12/*

 * Changes in this build here
   
.

*JDK 8u192 Early Access build 04 is available at : - http://jdk.java.net/8/*

 * JDK 8u192 timeline is available [3]
 o GA is scheduled for October 2018

**Conference videos online*
*

 * *OpenJDK Committers’ Workshop [4]*
 * JVM Language Summit 2018 [5]:


Regards,
Rory

[1] http://mail.openjdk.java.net/pipermail/jdk-dev/2018-July/001669.html
[2] http://jdk.java.net/11/release-notes
[3] http://openjdk.java.net/projects/jdk8u/releases/8u192.html
[4] https://www.youtube.com/playlist?list=PLX8CzqL3ArzXY_9Ornabhxs-j2h4hnvJ3
[5] https://www.youtube.com/playlist?list=PLX8CzqL3ArzVnxC6PYxMlngEMv3W1pIkn


--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland



Re: DBCP2 in Tomcat

2018-08-07 Thread Mark Thomas
On 07/08/18 08:55, jean-frederic clere wrote:
> Hi,
> 
> I just want to ask what is the process, we pick all changes after
> commons-dbcp releases a version, or could I pick the actual code?

Generally, I keep an eye on DBCP2/Pool2 and pick up the changes from
master after I see an issue fixed I think might affect Tomcat users.

DBCP2 has recently added support for later JDBC versions so we may need
to be careful exactly which branch we pull from going forwards. I'd made
a mental note to figure out what we needed to do but hadn't got around
to it.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DBCP2 in Tomcat

2018-08-07 Thread jean-frederic clere
Hi,

I just want to ask what is the process, we pick all changes after
commons-dbcp releases a version, or could I pick the actual code?

-- 
Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org