svn commit: r1758684 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/config/listeners.xml

[markt]

Author: markt
Date: Wed Aug 31 20:49:32 2016
New Revision: 1758684

URL: http://svn.apache.org/viewvc?rev=1758684=rev
Log:
ws police

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/config/listeners.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 20:49:32 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

[VOTE] Release Apache Tomcat 8.5.5

[Mark Thomas]

The proposed Apache Tomcat 8.5.5 release is now available for voting.

The major changes compared to the 8.5.4 release are:


- limited support for wildcard Host names and aliases

- fix regressions in JSSE TLS handshake

- treat paths used to obtain a request dispatcher as encoded
  (configurable)


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.5/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1092/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_5/

The proposed 8.5.5 release is:
[ ] Broken - do not release
[ ] Alpha  - go ahead and release as 8.5.5
[ ] Beta   - go ahead and release as 8.5.5
[ ] Stable - go ahead and release as 8.5.5

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

svn commit: r15114 - in /dev/tomcat/tomcat-8/v8.5.5: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Author: markt
Date: Wed Aug 31 20:45:53 2016
New Revision: 15114

Log:
Upload 8.5.5 for voting

Added:
dev/tomcat/tomcat-8/v8.5.5/
dev/tomcat/tomcat-8/v8.5.5/KEYS   (with props)
dev/tomcat/tomcat-8/v8.5.5/README.html   (with props)
dev/tomcat/tomcat-8/v8.5.5/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.5/bin/
dev/tomcat/tomcat-8/v8.5.5/bin/README.html   (with props)
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-deployer.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-deployer.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-deployer.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-deployer.zip.md5
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-deployer.zip.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-fulldocs.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-fulldocs.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-windows-x64.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-windows-x64.zip.md5
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-windows-x64.zip.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-windows-x86.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-windows-x86.zip.md5
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5-windows-x86.zip.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5.exe   (with props)
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5.exe.asc
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5.exe.md5
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5.exe.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5.zip   (with props)
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5.zip.md5
dev/tomcat/tomcat-8/v8.5.5/bin/apache-tomcat-8.5.5.zip.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/embed/
dev/tomcat/tomcat-8/v8.5.5/bin/embed/apache-tomcat-8.5.5-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.5/bin/embed/apache-tomcat-8.5.5-embed.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.5/bin/embed/apache-tomcat-8.5.5-embed.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.5/bin/embed/apache-tomcat-8.5.5-embed.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/embed/apache-tomcat-8.5.5-embed.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.5/bin/embed/apache-tomcat-8.5.5-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.5/bin/embed/apache-tomcat-8.5.5-embed.zip.md5
dev/tomcat/tomcat-8/v8.5.5/bin/embed/apache-tomcat-8.5.5-embed.zip.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/extras/
dev/tomcat/tomcat-8/v8.5.5/bin/extras/catalina-jmx-remote.jar   (with props)
dev/tomcat/tomcat-8/v8.5.5/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.5/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-8/v8.5.5/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-8/v8.5.5/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.5/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.5/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-8/v8.5.5/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-8/v8.5.5/src/
dev/tomcat/tomcat-8/v8.5.5/src/apache-tomcat-8.5.5-src.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.5/src/apache-tomcat-8.5.5-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.5/src/apache-tomcat-8.5.5-src.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.5/src/apache-tomcat-8.5.5-src.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.5/src/apache-tomcat-8.5.5-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.5/src/apache-tomcat-8.5.5-src.zip.asc
dev/tomcat/tomcat-8/v8.5.5/src/apache-tomcat-8.5.5-src.zip.md5
dev/tomcat/tomcat-8/v8.5.5/src/apache-tomcat-8.5.5-src.zip.sha1

Added: dev/tomcat/tomcat-8/v8.5.5/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.5/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.5/KEYS Wed Aug 31 20:45:53 2016
@@ -0,0 +1,616 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or

svn commit: r1758670 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_5: ./ build.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 31 19:49:00 2016
New Revision: 1758670

URL: http://svn.apache.org/viewvc?rev=1758670=rev
Log:
Tag 8.5.5

Added:
tomcat/tc8.5.x/tags/TOMCAT_8_5_5/   (props changed)
  - copied from r1758669, tomcat/tc8.5.x/trunk/
Modified:
tomcat/tc8.5.x/tags/TOMCAT_8_5_5/build.properties.default
tomcat/tc8.5.x/tags/TOMCAT_8_5_5/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_5/
--
bugtraq:append = false

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_5/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_5/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Aug 31 19:49:00 2016
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_5/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_5/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_5/
--
--- svn:ignore (added)
+++ svn:ignore Wed Aug 31 19:49:00 2016
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_5/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Aug 31 19:49:00 2016
@@ -0,0 +1 @@
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 

Re: svn commit: r1758580 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SocketWrapperBase.java

[Violeta Georgieva]

2016-08-31 14:03 GMT+03:00 Rémy Maucherat :
>
> 2016-08-31 12:49 GMT+02:00 :
>
> > Author: violetagg
> > Date: Wed Aug 31 10:49:10 2016
> > New Revision: 1758580
> >
> > URL: http://svn.apache.org/viewvc?rev=1758580=rev
> > Log:
> > When AprEndpoint.write(boolean, ByteBuffer) is invoked with a non direct
> > ByteBuffer then copy that ByteBuffer to the socket write buffer before
> > transferring the data to the socket.
> >
> > Ah ok, I forgot that. Well, ultimately, it's the same when using OpenSSL
> as well (the engine will do the wrapping for you). IMO it's unrealistic to
> write directly application layer byte buffers in all cases. If the socket
> buffer is direct, it should be copied there first IMO. The direct flag is
> probably the best hint of the right decision.

Do you mean the APR case or also NIO and NIO2? With the new API
CoyoteOutputStream.write(ByteBuffer) the application layer may provide
direct ByteBuffers so why should we copy them to the socket write buffer
and not use them directly?



>
> Rémy

Re: [GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

[Violeta Georgieva]

2016-08-31 19:23 GMT+03:00 Bill Barker <billbar...@apache.org>:
>
> To whom it may engage...
>
> This is an automated request, but not an unsolicited one. For
> more information please visit http://gump.apache.org/nagged.html,
> and/or contact the folk at gene...@gump.apache.org.
>
> Project tomcat-trunk-test-apr has an issue affecting its community
integration.
> This issue affects 1 projects.
> The current state of this project is 'Failed', with reason 'Build Failed'.
> For reference only, the following projects are affected by this:
> - tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the
Java Servlet 4.0,
> ...
>
>
> Full details are available at:
>
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html
>
> That said, some information snippets are provided here.
>
> The following annotations (debug/informational/warning/error messages)
were provided:
>  -DEBUG- Dependency on commons-daemon exists, no need to add for property
commons-daemon.native.src.tgz.
>  -DEBUG- Dependency on commons-daemon exists, no need to add for property
tomcat-native.tar.gz.
>  -INFO- Failed with reason build failed
>  -INFO- Project Reports in:
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
>  -INFO- Project Reports in:
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
>  -WARNING- No directory
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]
>
>
>
> The following work was performed:
>
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
> Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
> Work ended in a state of : Failed
> Elapsed: 38 mins 29 secs
> Command Line: /usr/lib/jvm/java-8-oracle/bin/java
-Djava.awt.headless=true -Dbuild.sysclasspath=only
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.5-SNAPSHOT.jar
-Dtest.reports=output/logs-APR
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160831-native-src.tar.gz
-Dexamples.sources.skip=true
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160831/lib
-Dtest.relaxTiming=true
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160831.jar
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160831-nat
>  ive-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true
-Dexecute.test.nio=false
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160831/bin/openssl
-Dexecute.test.apr=true -Dtest.excludePerformance=true
-Dexecute.test.nio2=false
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test
> [Working Directory: /srv/gump/public/workspace/tomcat-trunk]
> CLASSPATH:
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
>
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyot

svn commit: r1758649 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/config/listeners.xml

[markt]

Author: markt
Date: Wed Aug 31 16:33:15 2016
New Revision: 1758649

URL: http://svn.apache.org/viewvc?rev=1758649=rev
Log:
Whitespace police

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 16:33:15 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758584,1758588
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 38 mins 29 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.5-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160831-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160831/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160831.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160831-nat
 ive-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160831/bin/openssl
 -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina

svn commit: r1758647 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 31 16:26:16 2016
New Revision: 1758647

URL: http://svn.apache.org/viewvc?rev=1758647=rev
Log:
Bump version ready for dev cycle for next release

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/maven/mvn.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=1758647=1758646=1758647=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Aug 31 16:26:16 2016
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M10-dev
+version.suffix=.M11-dev
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1758647=1758646=1758647=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Wed Aug 31 16:26:16 2016
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=9.0.0.M10
+maven.asf.release.deploy.version=9.0.0.M11
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1758647=1758646=1758647=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 31 16:26:16 2016
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   



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

[VOTE] Release Apache Tomcat 9.0.0.M10

[Mark Thomas]

The proposed Apache Tomcat 9.0.0.M10 release is now available for voting.

This is a milestone release for the 9.0.x branch. It should be
noted that, as a milestone release:
- Servlet 4.0 is not finalised
- The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0

The major changes compared to the 9.0.0.M9 release are:

- limited support for wildcard Host names and aliases

- fix regressions in JSSE TLS handshake

- treat paths used to obtain a request dispatcher as encoded
  (configurable)

Along with lots of other bug fixes and improvements

For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M10/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1091/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M10/

The proposed 9.0.0.M10 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 9.0.0.M10

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

[Bug 57830] Add support for ProxyProtocol

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=57830

--- Comment #13 from Christopher Schultz  ---
Since I'm working with Daniel Ruggeri @ httpd, I've got an AWS lb set up for
testing. I should be able to apply your patch and test it... soon. Sorry for
the delay on this. Lots to do at $work.

-- 
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: r1758623 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

[remm]

Author: remm
Date: Wed Aug 31 15:31:27 2016
New Revision: 1758623

URL: http://svn.apache.org/viewvc?rev=1758623=rev
Log:
Changelog entry fix.

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=1758623=1758622=1758623=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Aug 31 15:31:27 2016
@@ -202,9 +202,8 @@
 key and certificate files for use with JSSE TLS connectors. (markt)
   
   
-59867: Don't hardcode key alias value to "tomcat" for JSSE.
-When using a keystore, OpenSSL will still need default to though.
-(remm)
+59910: Don't hardcode key alias value to "tomcat" for JSSE.
+When using a keystore, OpenSSL will still default to it. (remm)
   
   
 59904: Add a limit (default 200) for the number of cookies



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

svn commit: r1758622 - /tomcat/trunk/webapps/docs/changelog.xml

[remm]

Author: remm
Date: Wed Aug 31 15:31:20 2016
New Revision: 1758622

URL: http://svn.apache.org/viewvc?rev=1758622=rev
Log:
Changelog entry fix.

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1758622=1758621=1758622=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 31 15:31:20 2016
@@ -196,9 +196,8 @@
 key and certificate files for use with JSSE TLS connectors. (markt)
   
   
-59867: Don't hardcode key alias value to "tomcat" for JSSE.
-When using a keystore, OpenSSL will still need default to though.
-(remm)
+59910: Don't hardcode key alias value to "tomcat" for JSSE.
+When using a keystore, OpenSSL will still default to it. (remm)
   
   
 59904: Add a limit (default 200) for the number of cookies



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

svn commit: r15111 [2/2] - in /dev/tomcat/tomcat-9/v9.0.0.M10: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Added: dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.asc
==
--- dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.asc 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.asc 
Wed Aug 31 15:23:11 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJXxvJBAAoJEBDAHFovYFnnXIoQAK7U7qW9w2W3JZ/L0niVBRDE
+SKl7eDmuEILl5auhNPVer1No6DPcNWBjpaZLfeJHtfMM+wgKx0piMwjaWmPIa+yO
+RFsfJ659CWCAYTNiJpD5ZnlcMsZ9Mk84+7Sg0VZdRVhjPTbDEICV6fOBlO58m7aX
+851TyQltfp6Ma9JiZMCh2M6uYelAEfW1CqH20eEkFXlUp7okYlQ8gibOtNHQ7Qai
+n5eDQF5P8VzxP1V7F0vac5NB+xhRcVHIcV0PzXol2zA7ze80VUBOCPQBuNh6zizg
+bQ8ojiLC0lL3AAPKPAutWZy4+imKv0UvNrPy9sB+SeI7tgtAtYIooAqqcKQ4/95g
+8mMT64FhHrabgXNQWf+R6MVy/JQLjUDsFRLW6eTFANnZhKgpQZFtX3HIZVDRkUSq
+6Bdt0i9QMDgTJerhc/LXlUp5l0r5peRy16m+Wc7fN/Hqouq7gzH2qpRH9HY6MnHY
+9Tcm6ifLhNFxW2CbXeIFOuIehkkXCv8lytiE29BLJ/zYkJokzXCHv4YNwU9noRuM
+iehmmAKb0DuDhGIz04dx6NmHyl/iSi32b1qXAFaP9bjnFe+Wgfgk02SM5XSaIvgA
+0r3cgSMp0w2sBAdMMK682LD5w4b1tYEX6asEVxfqSLZ1JZz8PInQfmMQgv+OHjA+
+h0vPJerIDDgu61UDy6bf
+=5Kea
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.md5
==
--- dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.md5 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.md5 
Wed Aug 31 15:23:11 2016
@@ -0,0 +1 @@
+8b00f74b6168e9b0cc34a3e62c4037e8 *apache-tomcat-9.0.0.M10-src.tar.gz
\ No newline at end of file

Added: 
dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.sha1
==
--- dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.sha1 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.sha1 
Wed Aug 31 15:23:11 2016
@@ -0,0 +1 @@
+f1e49ba93e122b6bec33325c2ecc35f1667b5bb5 *apache-tomcat-9.0.0.M10-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip.asc
==
--- dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip.asc 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip.asc Wed 
Aug 31 15:23:11 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJXxvIiAAoJEBDAHFovYFnnf5AP/RuH1g5VrSISGItkYgAa0DuX
+fzCbdjBpRIxFFEnrRPBkczNBcSDtJ5DC0opMAf5vDr+HmuMZmOPHGM75P7tI+oQb
++H/6kdynrPsP1dV2/vAotsCnopIzuaJzIjMHxGIJXj6I+5wroJ+hj5J+ZWqcWXp2
+JpKh9pMAS8SwVcKik3lmporHtC3C2tGuihhTCXqXaCisehw+8BbTkqDe90+c9M36
+74u58tD2X2hs1vKQzdsgLcxcmZRYPeTlO79oRRpejen450UOb68I7TGq6pGqReF2
+9MGIRf5syFIc+iob7OFoKPW1Ni3kYaIGzYcWugX/Vbf7+NwzZm7L0Lf1mBjFGhDC
+GsH6dTXO24DffkCU9sBIkHg4BG0ALXXWgsZ9bsuITl5ARnaIrN5KJnRW08F7GKqI
+5yqLoZmsL3H40X4fylcbM2zlqEo3JHtad93DisvhdPkvOk8sV43rPgb22+EvgXK8
+SoNM8ko/zdWB3tgnG45bLcHG1zbysKbZH4ZQ3FILIbQxmzZW/+L2VK1uzUdVJlNx
+WUy0qeNKiaHzVEdR8ICccNvTDyN468dmUTarnYFYD8Tv1Mvr0ljSKfIeeBnuSvLj
+2aLmbh6CyN1X6/CrbbJm7nRV0RLq/Ho3o9fiG8n5MmZMJK+NMh/+6ZwK4BHo5f+U
+h4FGKhbAQ3F5zPGkPffD
+=1wuI
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip.md5
==
--- dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip.md5 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip.md5 Wed 
Aug 31 15:23:11 2016
@@ -0,0 +1 @@
+6d0ac9527145cf7aaed7affc54fa9f15 *apache-tomcat-9.0.0.M10-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip.sha1
==
--- dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip.sha1 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip.sha1 Wed 
Aug 31 15:23:11 2016
@@ -0,0 +1 @@
+0cccea02845515224dbf08527a33fe33e680ba92 *apache-tomcat-9.0.0.M10-src.zip
\ No newline at end of file



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

svn commit: r15111 [1/2] - in /dev/tomcat/tomcat-9/v9.0.0.M10: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Author: markt
Date: Wed Aug 31 15:23:11 2016
New Revision: 15111

Log:
Upload 9.0.0.M10 ready for voting

Added:
dev/tomcat/tomcat-9/v9.0.0.M10/
dev/tomcat/tomcat-9/v9.0.0.M10/KEYS   (with props)
dev/tomcat/tomcat-9/v9.0.0.M10/README.html   (with props)
dev/tomcat/tomcat-9/v9.0.0.M10/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.0.M10/bin/
dev/tomcat/tomcat-9/v9.0.0.M10/bin/README.html   (with props)
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-deployer.tar.gz  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-deployer.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-deployer.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-deployer.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-deployer.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-deployer.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-deployer.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-fulldocs.tar.gz  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-fulldocs.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-fulldocs.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-windows-x64.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-windows-x64.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-windows-x64.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-windows-x64.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-windows-x86.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-windows-x86.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-windows-x86.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10-windows-x86.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.exe   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.exe.asc
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.exe.md5
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.exe.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M10/bin/apache-tomcat-9.0.0.M10.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/embed/

dev/tomcat/tomcat-9/v9.0.0.M10/bin/embed/apache-tomcat-9.0.0.M10-embed.tar.gz   
(with props)

dev/tomcat/tomcat-9/v9.0.0.M10/bin/embed/apache-tomcat-9.0.0.M10-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M10/bin/embed/apache-tomcat-9.0.0.M10-embed.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M10/bin/embed/apache-tomcat-9.0.0.M10-embed.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/embed/apache-tomcat-9.0.0.M10-embed.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M10/bin/embed/apache-tomcat-9.0.0.M10-embed.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M10/bin/embed/apache-tomcat-9.0.0.M10-embed.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M10/bin/embed/apache-tomcat-9.0.0.M10-embed.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/extras/
dev/tomcat/tomcat-9/v9.0.0.M10/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M10/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M10/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M10/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-9/v9.0.0.M10/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M10/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M10/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/src/
dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M10/src/apache-tomcat-9.0.0.M10-src.zip.asc

svn commit: r1758616 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/startup/TestContextConfigAnnotation.java

[violetagg]

Author: violetagg
Date: Wed Aug 31 14:59:13 2016
New Revision: 1758616

URL: http://svn.apache.org/viewvc?rev=1758616=rev
Log:
Fix the creation of the file in the test. The test was failing when there is a 
space in the path.

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

tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 14:59:13 2016
@@ -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,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,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,1702739,1702742,1702
 
744,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,1725974,1726171-1
 
726173,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
 
/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,1749375,1749668-1749669,1750016,1750057,1750976,1751000,1751062,1751098,1754112,1754144,1754282,1754312,1754614,1754726,1754806,1754878,1754889,1754894,1754900,1754945,1754954,1754958,1755891,1755944,1756040,1756412,1756940,1757134,1757176,1757203,1757272,1757282,1757348,1757355,1757423,1757501,1757535,1758488,1758493,1758500,1758589

svn commit: r1758617 - in /tomcat/tags/TOMCAT_9_0_0_M10: ./ build.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 31 14:59:28 2016
New Revision: 1758617

URL: http://svn.apache.org/viewvc?rev=1758617=rev
Log:
Tag 9.0.0.M10

Added:
tomcat/tags/TOMCAT_9_0_0_M10/
  - copied from r1758615, tomcat/trunk/
Modified:
tomcat/tags/TOMCAT_9_0_0_M10/build.properties.default
tomcat/tags/TOMCAT_9_0_0_M10/webapps/docs/changelog.xml

Modified: tomcat/tags/TOMCAT_9_0_0_M10/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M10/build.properties.default?rev=1758617=1758615=1758617=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M10/build.properties.default (original)
+++ tomcat/tags/TOMCAT_9_0_0_M10/build.properties.default Wed Aug 31 14:59:28 
2016
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M10-dev
+version.suffix=.M10
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/tags/TOMCAT_9_0_0_M10/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M10/webapps/docs/changelog.xml?rev=1758617=1758615=1758617=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M10/webapps/docs/changelog.xml (original)
+++ tomcat/tags/TOMCAT_9_0_0_M10/webapps/docs/changelog.xml Wed Aug 31 14:59:28 
2016
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   



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

svn commit: r1758615 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/startup/TestContextConfigAnnotation.java

[violetagg]

Author: violetagg
Date: Wed Aug 31 14:51:53 2016
New Revision: 1758615

URL: http://svn.apache.org/viewvc?rev=1758615=rev
Log:
Fix the creation of the file in the test. The test was failing when there is a 
space in the path.

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

tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 14:51:53 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1758613 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/startup/TestContextConfigAnnotation.java

[violetagg]

Author: violetagg
Date: Wed Aug 31 14:47:51 2016
New Revision: 1758613

URL: http://svn.apache.org/viewvc?rev=1758613=rev
Log:
Fix the creation of the file in the test. The test was failing when there is a 
space in the path.

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

tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 14:47:51 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758584,1758588

svn commit: r1758608 - in /tomcat/site/trunk: docs/whoweare.html xdocs/whoweare.xml

[huxing]

Author: huxing
Date: Wed Aug 31 14:04:33 2016
New Revision: 1758608

URL: http://svn.apache.org/viewvc?rev=1758608=rev
Log:
Add Huxing Zhang to comitters list

Modified:
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/whoweare.xml

Modified: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1758608=1758607=1758608=diff
==
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Wed Aug 31 14:04:33 2016
@@ -437,6 +437,12 @@ A complete list of all the Apache Commit
 
 
 
+
+
+Huxing Zhang (huxing at apache.org)
+
+
+
 
 Emeritus PMC members
 

Modified: tomcat/site/trunk/xdocs/whoweare.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=1758608=1758607=1758608=diff
==
--- tomcat/site/trunk/xdocs/whoweare.xml (original)
+++ tomcat/site/trunk/xdocs/whoweare.xml Wed Aug 31 14:04:33 2016
@@ -135,6 +135,9 @@ A complete list of all the Apache Commit
 
 Tim Whittington (timw at apache.org)
 
+
+Huxing Zhang (huxing at apache.org)
+
 
 
 



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

svn commit: r1758593 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm: DataSourceRealm.java JDBCRealm.java

[markt]

Author: markt
Date: Wed Aug 31 11:37:53 2016
New Revision: 1758593

URL: http://svn.apache.org/viewvc?rev=1758593=rev
Log:
Clean-up

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=1758593=1758592=1758593=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java 
Wed Aug 31 11:37:53 2016
@@ -280,6 +280,7 @@ public class DataSourceRealm
  * @param credentials Password or other credentials to use in
  *  authenticating this username
  */
+@Override
 public Principal authenticate(String username, String credentials) {

// No user or no credentials
@@ -302,13 +303,6 @@ public class DataSourceRealm
 // Acquire a Principal object for this user
 return authenticate(dbConnection, username, credentials);
 
-} catch (SQLException e) {
-// Log the problem for posterity
-containerLog.error(sm.getString("dataSourceRealm.exception"), e);
-
-// Return "not authenticated" for this request
-return (null);
-
 } finally {
close(dbConnection);
 }
@@ -333,7 +327,7 @@ public class DataSourceRealm
  */
 protected Principal authenticate(Connection dbConnection,
String username,
-   String credentials) throws 
SQLException{
+   String credentials) {
 
 String dbCredentials = getPassword(dbConnection, username);
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1758593=1758592=1758593=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java Wed Aug 
31 11:37:53 2016
@@ -340,6 +340,7 @@ public class JDBCRealm
  * @param credentials Password or other credentials to use in
  *  authenticating this username
  */
+@Override
 public synchronized Principal authenticate(String username, String 
credentials) {
 
 // Number of tries is the numebr of attempts to connect to the database



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

svn commit: r1758592 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 31 11:31:36 2016
New Revision: 1758592

URL: http://svn.apache.org/viewvc?rev=1758592=rev
Log:
Correct Javadoc for ConnectionPool.suspect().
Based on a patch by Yahya Cahyadi.

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

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 11:31:36 2016
@@ -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,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,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,1702739,1702742,1702
 
744,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,1725974,1726171-1
 
726173,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

svn commit: r1758591 - in /tomcat/tc8.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 31 11:30:05 2016
New Revision: 1758591

URL: http://svn.apache.org/viewvc?rev=1758591=rev
Log:
Correct Javadoc for ConnectionPool.suspect().
Based on a patch by Yahya Cahyadi.

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

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 11:30:05 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1758589 - in /tomcat/tc8.5.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 31 11:29:23 2016
New Revision: 1758589

URL: http://svn.apache.org/viewvc?rev=1758589=rev
Log:
Correct Javadoc for ConnectionPool.suspect().
Based on a patch by Yahya Cahyadi.

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

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 11:29:23 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758584

svn commit: r1758590 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/JspCompilationContext.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Aug 31 11:29:27 2016
New Revision: 1758590

URL: http://svn.apache.org/viewvc?rev=1758590=rev
Log:
Fixed StringIndexOutOfBoundsException when trying to get the first char of an 
empty string. String.substring methods always return an object. Based on a 
patch provided by wuwen via Github.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 11:29:27 2016
@@ -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,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,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,1702739,1702742,1702
 
744,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,1725974,1726171-1
 
726173,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
 

svn commit: r1758588 - in /tomcat/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed Aug 31 11:28:45 2016
New Revision: 1758588

URL: http://svn.apache.org/viewvc?rev=1758588=rev
Log:
Correct Javadoc for ConnectionPool.suspect().
Based on a patch by Yahya Cahyadi.

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1758588=1758587=1758588=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Wed Aug 31 11:28:45 2016
@@ -557,9 +557,11 @@ public class ConnectionPool {
 }
 
 /**
- * thread safe way to abandon a connection
- * signals a connection to be abandoned.
- * this will disconnect the connection, and log the stack trace if 
logAbanded=true
+ * Thread safe way to suspect a connection. Similar to
+ * {@link #abandon(PooledConnection)}, but instead of actually abandoning
+ * the connection, this will log a warning and set the suspect flag on the
+ * {@link PooledConnection} if logAbandoned=true
+ *
  * @param con PooledConnection
  */
 protected void suspect(PooledConnection con) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1758588=1758587=1758588=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 31 11:28:45 2016
@@ -351,6 +351,10 @@
 Add log message of when returning the connection that has been marked
 suspect. (kfujino)
   
+  
+Correct Javadoc for ConnectionPool.suspect(). Based on a
+patch by Yahya Cahyadi. (markt)
+  
 
   
   



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

svn commit: r1758587 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/JspCompilationContext.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Aug 31 11:26:19 2016
New Revision: 1758587

URL: http://svn.apache.org/viewvc?rev=1758587=rev
Log:
Fixed StringIndexOutOfBoundsException when trying to get the first char of an 
empty string. String.substring methods always return an object. Based on a 
patch provided by wuwen via Github. This closes apache/tomcat80#6

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 11:26:19 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1758586 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/JspCompilationContext.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Aug 31 11:24:00 2016
New Revision: 1758586

URL: http://svn.apache.org/viewvc?rev=1758586=rev
Log:
Fixed StringIndexOutOfBoundsException when trying to get the first char of an 
empty string. String.substring methods always return an object. Based on a 
patch provided by wuwen via Github.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 11:24:00 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556

Re: Broken unit test with APR

[Violeta Georgieva]

2016-08-31 14:07 GMT+03:00 Mark Thomas :
>
> On 31/08/2016 12:06, Violeta Georgieva wrote:
> > 2016-08-31 14:03 GMT+03:00 Mark Thomas :
> >>
> >> On 31/08/2016 12:00, Violeta Georgieva wrote:
> >>
> >> 
> >>
> >>> I committed a fix and now I'm executing the tests with APR.
> >>> That particular test
org.apache.catalina.nonblocking.TestNonBlockingAPI
> > is
> >>> OK with the fix.
> >>
> >> Thanks. I've confirmed that for Windows and OSX so looking good.
> >>
> >> I'm running the full test suite for NIO/NIO2/APR on OSX/Windows/Linux
> >> now. If you see a 9.0.x tag, all is well :)
> >>
> >
> > Give me a sec to commit a fix for StringIndexOutOfBoundsException that
is
> > reported via github. OK?

I committed the fix

Thanks,
Violeta

> Sure. I've just discovered I don't have the latest tc-native built on my
> Linux test box so I need to fix that first anyway.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

svn commit: r1758584 - in /tomcat/trunk: java/org/apache/jasper/JspCompilationContext.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Wed Aug 31 11:16:49 2016
New Revision: 1758584

URL: http://svn.apache.org/viewvc?rev=1758584=rev
Log:
Fixed StringIndexOutOfBoundsException when trying to get the first char of an 
empty string. String.substring methods always return an object. Based on a 
patch provided by wuwen via Github. This closes apache/tomcat70#10 and 
apache/tomcat80#6

Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1758584=1758583=1758584=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Wed Aug 31 
11:16:49 2016
@@ -115,7 +115,7 @@ public class JspCompilationContext {
 
 String baseURI = jspUri.substring(0, jspUri.lastIndexOf('/') + 1);
 // hack fix for resolveRelativeURI
-if (baseURI == null) {
+if (baseURI.isEmpty()) {
 baseURI = "/";
 } else if (baseURI.charAt(0) != '/') {
 // strip the base slash since it will be combined with the

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1758584=1758583=1758584=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 31 11:16:49 2016
@@ -271,6 +271,10 @@
 Ignore engineOptionsClass and scratchdir when
 running under a security manager. (markt)
   
+  
+Fixed StringIndexOutOfBoundsException. Based on a patch provided by
+wuwen via Github. (violetagg)
+  
 
   
   



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

Re: svn commit: r1758580 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SocketWrapperBase.java

[Violeta Georgieva]

2016-08-31 14:08 GMT+03:00 Rémy Maucherat :
>
> 2016-08-31 12:49 GMT+02:00 :
>
> > Author: violetagg
> > Date: Wed Aug 31 10:49:10 2016
> > New Revision: 1758580
> >
> > URL: http://svn.apache.org/viewvc?rev=1758580=rev
> > Log:
> > When AprEndpoint.write(boolean, ByteBuffer) is invoked with a non direct
> > ByteBuffer then copy that ByteBuffer to the socket write buffer before
> > transferring the data to the socket.
> >
> > Hum, and is it the same thing on read as well ?
>

The new read methods with ByteBuffer are not used at the moment.
But yes it is the same.

> Rémy

Re: svn commit: r1758580 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SocketWrapperBase.java

[Rémy Maucherat]

2016-08-31 12:49 GMT+02:00 :

> Author: violetagg
> Date: Wed Aug 31 10:49:10 2016
> New Revision: 1758580
>
> URL: http://svn.apache.org/viewvc?rev=1758580=rev
> Log:
> When AprEndpoint.write(boolean, ByteBuffer) is invoked with a non direct
> ByteBuffer then copy that ByteBuffer to the socket write buffer before
> transferring the data to the socket.
>
> Hum, and is it the same thing on read as well ?

Rémy

Re: Broken unit test with APR

[Mark Thomas]

On 31/08/2016 12:06, Violeta Georgieva wrote:
> 2016-08-31 14:03 GMT+03:00 Mark Thomas :
>>
>> On 31/08/2016 12:00, Violeta Georgieva wrote:
>>
>> 
>>
>>> I committed a fix and now I'm executing the tests with APR.
>>> That particular test org.apache.catalina.nonblocking.TestNonBlockingAPI
> is
>>> OK with the fix.
>>
>> Thanks. I've confirmed that for Windows and OSX so looking good.
>>
>> I'm running the full test suite for NIO/NIO2/APR on OSX/Windows/Linux
>> now. If you see a 9.0.x tag, all is well :)
>>
> 
> Give me a sec to commit a fix for StringIndexOutOfBoundsException that is
> reported via github. OK?

Sure. I've just discovered I don't have the latest tc-native built on my
Linux test box so I need to fix that first anyway.

Mark

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

Re: Broken unit test with APR

[Violeta Georgieva]

2016-08-31 14:03 GMT+03:00 Mark Thomas :
>
> On 31/08/2016 12:00, Violeta Georgieva wrote:
>
> 
>
> > I committed a fix and now I'm executing the tests with APR.
> > That particular test org.apache.catalina.nonblocking.TestNonBlockingAPI
is
> > OK with the fix.
>
> Thanks. I've confirmed that for Windows and OSX so looking good.
>
> I'm running the full test suite for NIO/NIO2/APR on OSX/Windows/Linux
> now. If you see a 9.0.x tag, all is well :)
>

Give me a sec to commit a fix for StringIndexOutOfBoundsException that is
reported via github. OK?

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

svn commit: r1758582 - /tomcat/trunk/webapps/docs/config/listeners.xml

[markt]

Author: markt
Date: Wed Aug 31 11:04:54 2016
New Revision: 1758582

URL: http://svn.apache.org/viewvc?rev=1758582=rev
Log:
Whitespace police

Modified:
tomcat/trunk/webapps/docs/config/listeners.xml

Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1758582=1758581=1758582=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Wed Aug 31 11:04:54 2016
@@ -227,7 +227,7 @@
 class the PoolCleaner thread will be configured with the thread's
 context class loader set to the web application class loader which in
 turn will trigger a memory leak on reload. Defaults to
-true. This protection is disabled if running on Java 9 
+true. This protection is disabled if running on Java 9
 onwards since the leak has been fixed for Java 9 onwards.
   
 



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

Re: svn commit: r1758580 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SocketWrapperBase.java

[Rémy Maucherat]

2016-08-31 12:49 GMT+02:00 :

> Author: violetagg
> Date: Wed Aug 31 10:49:10 2016
> New Revision: 1758580
>
> URL: http://svn.apache.org/viewvc?rev=1758580=rev
> Log:
> When AprEndpoint.write(boolean, ByteBuffer) is invoked with a non direct
> ByteBuffer then copy that ByteBuffer to the socket write buffer before
> transferring the data to the socket.
>
> Ah ok, I forgot that. Well, ultimately, it's the same when using OpenSSL
as well (the engine will do the wrapping for you). IMO it's unrealistic to
write directly application layer byte buffers in all cases. If the socket
buffer is direct, it should be copied there first IMO. The direct flag is
probably the best hint of the right decision.

Rémy

Re: Broken unit test with APR

[Mark Thomas]

On 31/08/2016 12:00, Violeta Georgieva wrote:



> I committed a fix and now I'm executing the tests with APR.
> That particular test org.apache.catalina.nonblocking.TestNonBlockingAPI is
> OK with the fix.

Thanks. I've confirmed that for Windows and OSX so looking good.

I'm running the full test suite for NIO/NIO2/APR on OSX/Windows/Linux
now. If you see a 9.0.x tag, all is well :)

Mark


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

Re: Broken unit test with APR

[Violeta Georgieva]

2016-08-31 13:06 GMT+03:00 Violeta Georgieva :
>
>
>
> 2016-08-31 11:32 GMT+03:00 Violeta Georgieva :
> >
> >
> >
> > 2016-08-31 11:25 GMT+03:00 Mark Thomas :
> > >
> > > Hi,
> > >
> > > I'm running my last minute checks before tagging the 9.0.x and I'm
> > > hitting a problem with the following test:
> > >
> > > org.apache.catalina.nonblocking.TestNonBlockingAPI
> > >
> > > It passes with NIO and NIO2 but fails with APR in OSX and Windows.
> > >
> > > At a guess, this is related to the ByteBuffer refactoring. Any
pointers
> > > / help appreciated.
> >
> > I'll check that
>
> Ok APR doesn't like the idea with non direct ByteBuffers.
>
> I'll provide a fix in the next minutes.

I committed a fix and now I'm executing the tests with APR.
That particular test org.apache.catalina.nonblocking.TestNonBlockingAPI is
OK with the fix.

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

svn commit: r1758580 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SocketWrapperBase.java

[violetagg]

Author: violetagg
Date: Wed Aug 31 10:49:10 2016
New Revision: 1758580

URL: http://svn.apache.org/viewvc?rev=1758580=rev
Log:
When AprEndpoint.write(boolean, ByteBuffer) is invoked with a non direct 
ByteBuffer then copy that ByteBuffer to the socket write buffer before 
transferring the data to the socket.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1758580=1758579=1758580=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Aug 31 
10:49:10 2016
@@ -2479,6 +2479,59 @@ public class AprEndpoint extends Abstrac
 
 
 @Override
+protected void writeByteBufferBlocking(ByteBuffer from) throws 
IOException {
+if (from.isDirect()) {
+super.writeByteBufferBlocking(from);
+} else {
+// The socket write buffer capacity is socket.appWriteBufSize
+ByteBuffer writeBuffer = socketBufferHandler.getWriteBuffer();
+int limit = writeBuffer.capacity();
+while (from.remaining() >= limit) {
+socketBufferHandler.configureWriteBufferForWrite();
+transfer(from, writeBuffer);
+doWrite(true);
+}
+
+if (from.remaining() > 0) {
+socketBufferHandler.configureWriteBufferForWrite();
+transfer(from, writeBuffer);
+}
+}
+}
+
+
+@Override
+protected boolean writeByteBufferNonBlocking(ByteBuffer from) throws 
IOException {
+if (from.isDirect()) {
+return super.writeByteBufferNonBlocking(from);
+} else {
+// The socket write buffer capacity is socket.appWriteBufSize
+ByteBuffer writeBuffer = socketBufferHandler.getWriteBuffer();
+int limit = writeBuffer.capacity();
+while (from.remaining() >= limit) {
+socketBufferHandler.configureWriteBufferForWrite();
+transfer(from, writeBuffer);
+int newPosition = writeBuffer.position() + limit;
+doWrite(false);
+if (writeBuffer.position() != newPosition) {
+// Didn't write the whole amount of data in the last
+// non-blocking write.
+// Exit the loop.
+return true;
+}
+}
+
+if (from.remaining() > 0) {
+socketBufferHandler.configureWriteBufferForWrite();
+transfer(from, writeBuffer);
+}
+
+return false;
+}
+}
+
+
+@Override
 protected void doWrite(boolean block, ByteBuffer from) throws 
IOException {
 if (closed) {
 throw new IOException(sm.getString("socket.apr.closed", 
getSocket()));

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1758580=1758579=1758580=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Wed Aug 
31 10:49:10 2016
@@ -453,7 +453,7 @@ public abstract class SocketWrapperBase<
 }
 
 
-private void writeByteBufferBlocking(ByteBuffer from) throws IOException {
+protected void writeByteBufferBlocking(ByteBuffer from) throws IOException 
{
 // The socket write buffer capacity is socket.appWriteBufSize
 int limit = socketBufferHandler.getWriteBuffer().capacity();
 int fromLimit = from.limit();
@@ -551,7 +551,7 @@ public abstract class SocketWrapperBase<
 }
 
 
-private boolean writeByteBufferNonBlocking(ByteBuffer from) throws 
IOException {
+protected boolean writeByteBufferNonBlocking(ByteBuffer from) throws 
IOException {
 // The socket write buffer capacity is socket.appWriteBufSize
 int limit = socketBufferHandler.getWriteBuffer().capacity();
 int fromLimit = from.limit();



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

Re: Broken unit test with APR

[Violeta Georgieva]

2016-08-31 11:32 GMT+03:00 Violeta Georgieva :
>
>
>
> 2016-08-31 11:25 GMT+03:00 Mark Thomas :
> >
> > Hi,
> >
> > I'm running my last minute checks before tagging the 9.0.x and I'm
> > hitting a problem with the following test:
> >
> > org.apache.catalina.nonblocking.TestNonBlockingAPI
> >
> > It passes with NIO and NIO2 but fails with APR in OSX and Windows.
> >
> > At a guess, this is related to the ByteBuffer refactoring. Any pointers
> > / help appreciated.
>
> I'll check that

Ok APR doesn't like the idea with non direct ByteBuffers.

I'll provide a fix in the next minutes.

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

svn commit: r1758564 - /tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml

[markt]

Author: markt
Date: Wed Aug 31 09:29:53 2016
New Revision: 1758564

URL: http://svn.apache.org/viewvc?rev=1758564=rev
Log:
ws

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml

Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml?rev=1758564=1758563=1758564=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml Wed Aug 31 09:29:53 
2016
@@ -264,7 +264,7 @@
 triggered by a web application. Defaults to true.
 Note: The underlying leak has been fixed in Java 7 update 51 onwards
 and Java 8 onwards. This protection is therefor disabled if running on
-Java 8  onwards.
+Java 8 onwards.
   
 
   



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

svn commit: r1758563 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/config/listeners.xml

[markt]

Author: markt
Date: Wed Aug 31 09:29:41 2016
New Revision: 1758563

URL: http://svn.apache.org/viewvc?rev=1758563=rev
Log:
The latest Java 9 early access builds have fixed some more memory leaks.
Also disable protection that is fixed in Java 8 when running on Java 8

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc8.0.x/trunk/webapps/docs/config/listeners.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 09:29:41 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1758560 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml

[markt]

Author: markt
Date: Wed Aug 31 09:23:22 2016
New Revision: 1758560

URL: http://svn.apache.org/viewvc?rev=1758560=rev
Log:
The latest Java 9 early access builds have fixed some more memory leaks.
Also disable protection that is fixed in Java 8 when running on Java 8

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

tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 09:23:22 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525

svn commit: r1758556 - in /tomcat/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/config/listeners.xml

[markt]

Author: markt
Date: Wed Aug 31 09:09:47 2016
New Revision: 1758556

URL: http://svn.apache.org/viewvc?rev=1758556=rev
Log:
The latest Java 9 early access builds have fixed some more memory leaks.

Modified:

tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/webapps/docs/config/listeners.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1758556=1758555=1758556=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java 
Wed Aug 31 09:09:47 2016
@@ -251,8 +251,10 @@ public class JreMemoryLeakPreventionList
  * to the web application class loader.
  *
  * Instead we initialize JCA right now.
+ *
+ * Fixed in Java 9 onwards (from early access build 133)
  */
-if (tokenPollerProtection) {
+if (tokenPollerProtection && !JreCompat.isJre9Available()) {
 java.security.Security.getProviders();
 }
 
@@ -287,7 +289,10 @@ public class JreMemoryLeakPreventionList
 }
 }
 
-if (xmlParsingProtection) {
+/*
+ * Fixed in Java 9 onwards (from early access build 133)
+ */
+if (xmlParsingProtection && !JreCompat.isJre9Available()) {
 // There are two known issues with XML parsing that affect
 // Java 8+. The issues both relate to cached Exception
 // instances that retain a link to the TCCL via the

Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1758556=1758555=1758556=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Wed Aug 31 09:09:47 2016
@@ -182,7 +182,9 @@
 Enables protection so that calls to
 java.awt.Toolkit.getDefaultToolkit() triggered by a web
 application do not result in a memory leak.
-Defaults to false because an AWT thread is launched.
+Defaults to false because an AWT thread is launched. This
+protection is disabled if running on Java 9 onwards since the leak has
+been fixed for Java 9 onwards.
   
 
   
@@ -210,7 +212,9 @@
 trigger a call to this method. A side effect of enabling this 
protection
 is the creation of a thread named "GC Daemon". The protection uses
 reflection to access internal Sun classes and may generate errors on
-startup on non-Sun JVMs. The default is true.
+startup on non-Sun JVMs. The default is true. This
+protection is disabled if running on Java 9 onwards since the leak has
+been fixed for Java 9 onwards.
   
 
   
@@ -223,7 +227,8 @@
 class the PoolCleaner thread will be configured with the thread's
 context class loader set to the web application class loader which in
 turn will trigger a memory leak on reload. Defaults to
-true.
+true. This protection is disabled if running on Java 9 
+onwards since the leak has been fixed for Java 9 onwards.
   
 
   
@@ -235,7 +240,9 @@
 deployment when the MessageDigest for generating session IDs is
 initialized. As a result the thread has the Webapp class loader as its
 thread context class loader. Enabling the protection initializes JCA
-early during Tomcat startup. Defaults to true.
+early during Tomcat startup. Defaults to true. This
+protection is disabled if running on Java 9 onwards since the leak has
+been fixed for Java 9 onwards.
   
 
   
@@ -251,7 +258,9 @@
 Enables protection so that parsing XML files within a web 
application
 does not result in a memory leak. Note that memory profilers may not
 display the GC root associated with this leak making it particularly
-hard to diagnose. Defaults to true.
+hard to diagnose. Defaults to true. This protection is
+disabled if running on Java 9 onwards since the leak has been fixed for
+Java 9 onwards.
   
 
 



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

Re: The magic phrase to auto-close the PR in github

[Martin Grigorov]

Hi,


On Wed, Aug 31, 2016 at 10:25 AM, Violeta Georgieva 
wrote:

> 2016-08-31 11:17 GMT+03:00 Mark Thomas :
> >
> > On 31/08/2016 09:16, Violeta Georgieva wrote:
> > > 2016-08-31 10:59 GMT+03:00 Mark Thomas :
> > >>
> > >> On 31/08/2016 08:47, Violeta Georgieva wrote:
> > >>> Hi Mark,
> > >>>
> > >>> 2016-08-10 14:38 GMT+03:00 Violeta Georgieva :
> > 
> > 
> > 
> >  2016-08-10 14:08 GMT+03:00 Mark Thomas :
> > >
> > > On 10/08/2016 11:45, violet...@apache.org wrote:
> > >> Author: violetagg
> > >> Date: Wed Aug 10 10:45:42 2016
> > >> New Revision: 1755717
> > >>
> > >> URL: http://svn.apache.org/viewvc?rev=1755717=rev
> > >> Log:
> > >> MBeans Descriptors How-To is moved to
> mbeans-descriptors-howto.html.
> > >>> Patch provided by Radoslav Husar. This solves Github PR#33
> > >
> > > The magic phrase to auto-close the PR is:
> > >>>
> > >>> Will the magic phrase auto-close the PR when it is not against trunk?
> > >>> https://github.com/apache/tomcat80/pull/6
> > >>
> > >> GitHub integration is only configured for trunk. I can set it up for
> the
> > >> other branches if that is what we want.
> > >
> > > With "trunk" I meant Tomcat 9 repo https://github.com/apache/tomcat
> > >
> > > Is it configured only for Tomcat 9?
> >
> > Currently it is only configured for Tomcat 9.
> >
> > > If yes should we ask the people to prepare the patches against Tomcat 9
> > > only or we can extend this integration for other Tomcat versions?
> >
> > Either is an option. Generally patches are applied to trunk and
> > back-ported but we can't prevent pull requests against earlier versions.
> >
> > I have no preference. What do others think?
>

3rd option: merge all GitHub repos into one.
Currently each SVN branch has its own GitHub repositoty.
Is there a reason for that ?
There could be just one GitHub repo with the same branches as in Apache SVN.
IMO this will simplify the things for the contributors too.


>
> +1 for integration with the other Tomcat versions.
>
> > Mark
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
>

Re: Broken unit test with APR

[Violeta Georgieva]

2016-08-31 11:25 GMT+03:00 Mark Thomas :
>
> Hi,
>
> I'm running my last minute checks before tagging the 9.0.x and I'm
> hitting a problem with the following test:
>
> org.apache.catalina.nonblocking.TestNonBlockingAPI
>
> It passes with NIO and NIO2 but fails with APR in OSX and Windows.
>
> At a guess, this is related to the ByteBuffer refactoring. Any pointers
> / help appreciated.

I'll check that

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

Broken unit test with APR

[Mark Thomas]

Hi,

I'm running my last minute checks before tagging the 9.0.x and I'm
hitting a problem with the following test:

org.apache.catalina.nonblocking.TestNonBlockingAPI

It passes with NIO and NIO2 but fails with APR in OSX and Windows.

At a guess, this is related to the ByteBuffer refactoring. Any pointers
/ help appreciated.

Mark

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

Re: The magic phrase to auto-close the PR in github

[Violeta Georgieva]

2016-08-31 11:17 GMT+03:00 Mark Thomas :
>
> On 31/08/2016 09:16, Violeta Georgieva wrote:
> > 2016-08-31 10:59 GMT+03:00 Mark Thomas :
> >>
> >> On 31/08/2016 08:47, Violeta Georgieva wrote:
> >>> Hi Mark,
> >>>
> >>> 2016-08-10 14:38 GMT+03:00 Violeta Georgieva :
> 
> 
> 
>  2016-08-10 14:08 GMT+03:00 Mark Thomas :
> >
> > On 10/08/2016 11:45, violet...@apache.org wrote:
> >> Author: violetagg
> >> Date: Wed Aug 10 10:45:42 2016
> >> New Revision: 1755717
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1755717=rev
> >> Log:
> >> MBeans Descriptors How-To is moved to
mbeans-descriptors-howto.html.
> >>> Patch provided by Radoslav Husar. This solves Github PR#33
> >
> > The magic phrase to auto-close the PR is:
> >>>
> >>> Will the magic phrase auto-close the PR when it is not against trunk?
> >>> https://github.com/apache/tomcat80/pull/6
> >>
> >> GitHub integration is only configured for trunk. I can set it up for
the
> >> other branches if that is what we want.
> >
> > With "trunk" I meant Tomcat 9 repo https://github.com/apache/tomcat
> >
> > Is it configured only for Tomcat 9?
>
> Currently it is only configured for Tomcat 9.
>
> > If yes should we ask the people to prepare the patches against Tomcat 9
> > only or we can extend this integration for other Tomcat versions?
>
> Either is an option. Generally patches are applied to trunk and
> back-ported but we can't prevent pull requests against earlier versions.
>
> I have no preference. What do others think?

+1 for integration with the other Tomcat versions.

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

Re: The magic phrase to auto-close the PR in github

[Mark Thomas]

On 31/08/2016 09:16, Violeta Georgieva wrote:
> 2016-08-31 10:59 GMT+03:00 Mark Thomas :
>>
>> On 31/08/2016 08:47, Violeta Georgieva wrote:
>>> Hi Mark,
>>>
>>> 2016-08-10 14:38 GMT+03:00 Violeta Georgieva :



 2016-08-10 14:08 GMT+03:00 Mark Thomas :
>
> On 10/08/2016 11:45, violet...@apache.org wrote:
>> Author: violetagg
>> Date: Wed Aug 10 10:45:42 2016
>> New Revision: 1755717
>>
>> URL: http://svn.apache.org/viewvc?rev=1755717=rev
>> Log:
>> MBeans Descriptors How-To is moved to mbeans-descriptors-howto.html.
>>> Patch provided by Radoslav Husar. This solves Github PR#33
>
> The magic phrase to auto-close the PR is:
>>>
>>> Will the magic phrase auto-close the PR when it is not against trunk?
>>> https://github.com/apache/tomcat80/pull/6
>>
>> GitHub integration is only configured for trunk. I can set it up for the
>> other branches if that is what we want.
> 
> With "trunk" I meant Tomcat 9 repo https://github.com/apache/tomcat
> 
> Is it configured only for Tomcat 9?

Currently it is only configured for Tomcat 9.

> If yes should we ask the people to prepare the patches against Tomcat 9
> only or we can extend this integration for other Tomcat versions?

Either is an option. Generally patches are applied to trunk and
back-ported but we can't prevent pull requests against earlier versions.

I have no preference. What do others think?

Mark

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

Re: The magic phrase to auto-close the PR in github

[Violeta Georgieva]

2016-08-31 10:59 GMT+03:00 Mark Thomas :
>
> On 31/08/2016 08:47, Violeta Georgieva wrote:
> > Hi Mark,
> >
> > 2016-08-10 14:38 GMT+03:00 Violeta Georgieva :
> >>
> >>
> >>
> >> 2016-08-10 14:08 GMT+03:00 Mark Thomas :
> >>>
> >>> On 10/08/2016 11:45, violet...@apache.org wrote:
>  Author: violetagg
>  Date: Wed Aug 10 10:45:42 2016
>  New Revision: 1755717
> 
>  URL: http://svn.apache.org/viewvc?rev=1755717=rev
>  Log:
>  MBeans Descriptors How-To is moved to mbeans-descriptors-howto.html.
> > Patch provided by Radoslav Husar. This solves Github PR#33
> >>>
> >>> The magic phrase to auto-close the PR is:
> >
> > Will the magic phrase auto-close the PR when it is not against trunk?
> > https://github.com/apache/tomcat80/pull/6
>
> GitHub integration is only configured for trunk. I can set it up for the
> other branches if that is what we want.

With "trunk" I meant Tomcat 9 repo https://github.com/apache/tomcat

Is it configured only for Tomcat 9?

If yes should we ask the people to prepare the patches against Tomcat 9
only or we can extend this integration for other Tomcat versions?

Sorry I was not clear in my previous message.

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

buildbot success in on tomcat-8-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/747

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1758539
Blamelist: kfujino

Build succeeded!

Sincerely,
 -The Buildbot




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

Re: The magic phrase to auto-close the PR in github

[Violeta Georgieva]

2016-08-31 11:01 GMT+03:00 Martin Grigorov :
>
> Hi Violeta,
>
> On Wed, Aug 31, 2016 at 9:47 AM, Violeta Georgieva 
> wrote:
>
> > Hi Mark,
> >
> > 2016-08-10 14:38 GMT+03:00 Violeta Georgieva :
> > >
> > >
> > >
> > > 2016-08-10 14:08 GMT+03:00 Mark Thomas :
> > > >
> > > > On 10/08/2016 11:45, violet...@apache.org wrote:
> > > > > Author: violetagg
> > > > > Date: Wed Aug 10 10:45:42 2016
> > > > > New Revision: 1755717
> > > > >
> > > > > URL: http://svn.apache.org/viewvc?rev=1755717=rev
> > > > > Log:
> > > > > MBeans Descriptors How-To is moved to
mbeans-descriptors-howto.html.
> > Patch provided by Radoslav Husar. This solves Github PR#33
> > > >
> > > > The magic phrase to auto-close the PR is:
> >
> > Will the magic phrase auto-close the PR when it is not against trunk?
> > https://github.com/apache/tomcat80/pull/6
>
>
> I think if you merge the commit in tomcat80 branch it should work.
> Both https://github.com/apache/tomcat and
https://github.com/apache/tomcat80
> have their own "trunk" branch in GitHub.

With "trunk" I meant Tomcat 9 repo https://github.com/apache/tomcat


>
>
> >
> > Thanks a lot,
> > Violeta
> >

Re: The magic phrase to auto-close the PR in github

[Martin Grigorov]

Hi Violeta,

On Wed, Aug 31, 2016 at 9:47 AM, Violeta Georgieva 
wrote:

> Hi Mark,
>
> 2016-08-10 14:38 GMT+03:00 Violeta Georgieva :
> >
> >
> >
> > 2016-08-10 14:08 GMT+03:00 Mark Thomas :
> > >
> > > On 10/08/2016 11:45, violet...@apache.org wrote:
> > > > Author: violetagg
> > > > Date: Wed Aug 10 10:45:42 2016
> > > > New Revision: 1755717
> > > >
> > > > URL: http://svn.apache.org/viewvc?rev=1755717=rev
> > > > Log:
> > > > MBeans Descriptors How-To is moved to mbeans-descriptors-howto.html.
> Patch provided by Radoslav Husar. This solves Github PR#33
> > >
> > > The magic phrase to auto-close the PR is:
>
> Will the magic phrase auto-close the PR when it is not against trunk?
> https://github.com/apache/tomcat80/pull/6


I think if you merge the commit in tomcat80 branch it should work.
Both https://github.com/apache/tomcat and https://github.com/apache/tomcat80
have their own "trunk" branch in GitHub.


>
> Thanks a lot,
> Violeta
>

Re: Early Access builds of JDK 8u112 b04, JDK 9 b130 are available on java.net

[Mark Thomas]

On 31/08/2016 08:59, Chris Hegarty wrote:
> On 08/08/16 11:20, Chris Hegarty wrote:
>>
>>> On 8 Aug 2016, at 08:51, Rory O'Donnell 
>>> wrote:
>>>
>>> Hi Mark,
>>>
>>> There are two fixes to bugs reported by you in b130, can you confirm
>>> fixes  ?
>>>
>>> Early Access b130  for JDK 9 is
>>> available on java.net, summary of  changes are listed here
>>> .
>>>
>>> 8156824 core-libs com.sun.jndi.ldap.pool.PoolCleaner should clear its
>>> context class loader
>>> 8157570 core-libs sun.rmi.transport.GC retains a strong reference to
>>> the context class loader
>>
>> With the two changes above, then several cleanups in
>> JreMemoryLeakPreventionListener::lifecycleEvent can be done in a JDK 9
>> specific Tomcat source trunk. Otherwise, if the code needs to run on
>> older
>> releases, it can be be made version specific, where it is not executed on
>> JDK 9 or greater.
>>
>> There is another of these unnecessary retention of the context class
>> loader
>> issues, 8156841 [1], that I hope to address in a near future build of
>> JDK 9.
> 
> 
> JDK bug 8156841 has been fixed in JDK 9 b133. The same
> isJre9Available() technique can be used to avoid
> tokenPollerProtection.

Fantastic. And just in time for the next round of releases.

Many thanks to everyone who helped get this fixed.

Mark


> 
> -Chris.
> 
>> -Chris.
>>
>> [1] https://bugs.openjdk.java.net/browse/JDK-8156841
>>
> 
> -
> 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: The magic phrase to auto-close the PR in github

[Mark Thomas]

On 31/08/2016 08:47, Violeta Georgieva wrote:
> Hi Mark,
> 
> 2016-08-10 14:38 GMT+03:00 Violeta Georgieva :
>>
>>
>>
>> 2016-08-10 14:08 GMT+03:00 Mark Thomas :
>>>
>>> On 10/08/2016 11:45, violet...@apache.org wrote:
 Author: violetagg
 Date: Wed Aug 10 10:45:42 2016
 New Revision: 1755717

 URL: http://svn.apache.org/viewvc?rev=1755717=rev
 Log:
 MBeans Descriptors How-To is moved to mbeans-descriptors-howto.html.
> Patch provided by Radoslav Husar. This solves Github PR#33
>>>
>>> The magic phrase to auto-close the PR is:
> 
> Will the magic phrase auto-close the PR when it is not against trunk?
> https://github.com/apache/tomcat80/pull/6

GitHub integration is only configured for trunk. I can set it up for the
other branches if that is what we want.

Mark


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

Re: Early Access builds of JDK 8u112 b04, JDK 9 b130 are available on java.net

[Chris Hegarty]

On 08/08/16 11:20, Chris Hegarty wrote:



On 8 Aug 2016, at 08:51, Rory O'Donnell  wrote:

Hi Mark,

There are two fixes to bugs reported by you in b130, can you confirm fixes  ?

Early Access b130  for JDK 9 is available on 
java.net, summary of  changes are listed here 
.

8156824 core-libs com.sun.jndi.ldap.pool.PoolCleaner should clear its context 
class loader
8157570 core-libs sun.rmi.transport.GC retains a strong reference to the 
context class loader


With the two changes above, then several cleanups in
JreMemoryLeakPreventionListener::lifecycleEvent can be done in a JDK 9
specific Tomcat source trunk. Otherwise, if the code needs to run on older
releases, it can be be made version specific, where it is not executed on
JDK 9 or greater.

There is another of these unnecessary retention of the context class loader
issues, 8156841 [1], that I hope to address in a near future build of JDK 9.



JDK bug 8156841 has been fixed in JDK 9 b133. The same
isJre9Available() technique can be used to avoid
tokenPollerProtection.

-Chris.


-Chris.

[1] https://bugs.openjdk.java.net/browse/JDK-8156841



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

svn commit: r1758540 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Wed Aug 31 07:56:23 2016
New Revision: 1758540

URL: http://svn.apache.org/viewvc?rev=1758540=rev
Log:
Additional fix for BZ60043.
Add log message of when returning the connection that has been marked suspect.

Modified:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1758540=1758539=1758540=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Wed Aug 31 07:56:23 2016
@@ -889,7 +889,12 @@ public class ConnectionPool {
 if (con != null) {
 try {
 con.lock();
-
+if (con.isSuspect()) {
+if (poolProperties.isLogAbandoned() && 
log.isInfoEnabled()) {
+log.info("Connection(" + con + ") that has been marked 
suspect was returned."
++ " The processing time is " + 
(System.currentTimeMillis()-con.getTimestamp()) + " ms.");
+}
+}
 if (busy.remove(con)) {
 
 if (!shouldClose(con,PooledConnection.VALIDATE_RETURN)) {

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1758540=1758539=1758540=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 31 07:56:23 2016
@@ -288,6 +288,10 @@
 without removing connection when the removeAbandoned is
 disabled. (kfujino)
   
+  
+Add log message of when returning the connection that has been marked
+suspect. (kfujino)
+  
 
   
   



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

svn commit: r1758539 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Wed Aug 31 07:54:19 2016
New Revision: 1758539

URL: http://svn.apache.org/viewvc?rev=1758539=rev
Log:
Additional fix for BZ60043.
Add log message of when returning the connection that has been marked suspect.

Modified:

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1758539=1758538=1758539=diff
==
--- 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Wed Aug 31 07:54:19 2016
@@ -886,7 +886,12 @@ public class ConnectionPool {
 if (con != null) {
 try {
 con.lock();
-
+if (con.isSuspect()) {
+if (poolProperties.isLogAbandoned() && 
log.isInfoEnabled()) {
+log.info("Connection(" + con + ") that has been marked 
suspect was returned."
++ " The processing time is " + 
(System.currentTimeMillis()-con.getTimestamp()) + " ms.");
+}
+}
 if (busy.remove(con)) {
 
 if (!shouldClose(con,PooledConnection.VALIDATE_RETURN)) {

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1758539=1758538=1758539=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Aug 31 07:54:19 2016
@@ -360,6 +360,10 @@
 without removing connection when the removeAbandoned is
 disabled. (kfujino)
   
+  
+Add log message of when returning the connection that has been marked
+suspect. (kfujino)
+  
 
   
   



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

svn commit: r1758538 - in /tomcat/tc8.5.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Wed Aug 31 07:52:02 2016
New Revision: 1758538

URL: http://svn.apache.org/viewvc?rev=1758538=rev
Log:
Additional fix for BZ60043.
Add log message of when returning the connection that has been marked suspect.

Modified:

tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1758538=1758537=1758538=diff
==
--- 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Wed Aug 31 07:52:02 2016
@@ -895,7 +895,12 @@ public class ConnectionPool {
 if (con != null) {
 try {
 con.lock();
-
+if (con.isSuspect()) {
+if (poolProperties.isLogAbandoned() && 
log.isInfoEnabled()) {
+log.info("Connection(" + con + ") that has been marked 
suspect was returned."
++ " The processing time is " + 
(System.currentTimeMillis()-con.getTimestamp()) + " ms.");
+}
+}
 if (busy.remove(con)) {
 
 if (!shouldClose(con,PooledConnection.VALIDATE_RETURN)) {

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=1758538=1758537=1758538=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Aug 31 07:52:02 2016
@@ -339,6 +339,10 @@
 without removing connection when the removeAbandoned is
 disabled. (kfujino)
   
+  
+Add log message of when returning the connection that has been marked
+suspect. (kfujino)
+  
 
   
   



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

svn commit: r1758537 - in /tomcat/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Wed Aug 31 07:50:06 2016
New Revision: 1758537

URL: http://svn.apache.org/viewvc?rev=1758537=rev
Log:
Additional fix for BZ60043.
Add log message of when returning the connection that has been marked suspect.

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1758537=1758536=1758537=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Wed Aug 31 07:50:06 2016
@@ -895,7 +895,12 @@ public class ConnectionPool {
 if (con != null) {
 try {
 con.lock();
-
+if (con.isSuspect()) {
+if (poolProperties.isLogAbandoned() && 
log.isInfoEnabled()) {
+log.info("Connection(" + con + ") that has been marked 
suspect was returned."
++ " The processing time is " + 
(System.currentTimeMillis()-con.getTimestamp()) + " ms.");
+}
+}
 if (busy.remove(con)) {
 
 if (!shouldClose(con,PooledConnection.VALIDATE_RETURN)) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1758537=1758536=1758537=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 31 07:50:06 2016
@@ -343,6 +343,10 @@
 without removing connection when the removeAbandoned is
 disabled. (kfujino)
   
+  
+Add log message of when returning the connection that has been marked
+suspect. (kfujino)
+  
 
   
   



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

buildbot success in on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1647

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1758525
Blamelist: remm

Build succeeded!

Sincerely,
 -The Buildbot




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

The magic phrase to auto-close the PR in github

[Violeta Georgieva]

Hi Mark,

2016-08-10 14:38 GMT+03:00 Violeta Georgieva :
>
>
>
> 2016-08-10 14:08 GMT+03:00 Mark Thomas :
> >
> > On 10/08/2016 11:45, violet...@apache.org wrote:
> > > Author: violetagg
> > > Date: Wed Aug 10 10:45:42 2016
> > > New Revision: 1755717
> > >
> > > URL: http://svn.apache.org/viewvc?rev=1755717=rev
> > > Log:
> > > MBeans Descriptors How-To is moved to mbeans-descriptors-howto.html.
Patch provided by Radoslav Husar. This solves Github PR#33
> >
> > The magic phrase to auto-close the PR is:

Will the magic phrase auto-close the PR when it is not against trunk?
https://github.com/apache/tomcat80/pull/6

Thanks a lot,
Violeta

[Bug 59654] Jsp spec violation in tld identifying?

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59654

--- Comment #6 from Mark Thomas  ---
The requirement does apply to Tomcat 7.0.x and 6.0.x. It is present in JSP 2.1
and JSP 2.2. It is in the same section (JSP.7.3.1) as quoted in the original
report.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

Re: svn commit: r1758525 - /tomcat/trunk/test/org/apache/catalina/realm/TestMemoryRealm.java

[Mark Thomas]

On 31/08/2016 08:36, r...@apache.org wrote:
> Author: remm
> Date: Wed Aug 31 07:36:20 2016
> New Revision: 1758525
> 
> URL: http://svn.apache.org/viewvc?rev=1758525=rev
> Log:
> Fix test, a plain realm now needs a credentials handler since it's only set 
> in startInternal.

Thanks. It was late last night and I missed the later versions needed
the fix too.

Mark


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

svn commit: r1758526 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/realm/TestMemoryRealm.java

[remm]

Author: remm
Date: Wed Aug 31 07:37:31 2016
New Revision: 1758526

URL: http://svn.apache.org/viewvc?rev=1758526=rev
Log:
Fix test, a plain realm now needs a credentials handler since it's only set in 
startInternal.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/catalina/realm/TestMemoryRealm.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 31 07:37:31 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,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,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 

svn commit: r1758525 - /tomcat/trunk/test/org/apache/catalina/realm/TestMemoryRealm.java

[remm]

Author: remm
Date: Wed Aug 31 07:36:20 2016
New Revision: 1758525

URL: http://svn.apache.org/viewvc?rev=1758525=rev
Log:
Fix test, a plain realm now needs a credentials handler since it's only set in 
startInternal.

Modified:
tomcat/trunk/test/org/apache/catalina/realm/TestMemoryRealm.java

Modified: tomcat/trunk/test/org/apache/catalina/realm/TestMemoryRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/realm/TestMemoryRealm.java?rev=1758525=1758524=1758525=diff
==
--- tomcat/trunk/test/org/apache/catalina/realm/TestMemoryRealm.java (original)
+++ tomcat/trunk/test/org/apache/catalina/realm/TestMemoryRealm.java Wed Aug 31 
07:36:20 2016
@@ -29,6 +29,7 @@ public class TestMemoryRealm {
 @Test
 public void testBug56246() {
 MemoryRealm memoryRealm = new MemoryRealm();
+memoryRealm.setCredentialHandler(new MessageDigestCredentialHandler());
 
 Principal p = memoryRealm.authenticate("foo", "bar");
 



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