buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3239 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] 1830868 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3238 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] 1830864 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1830869 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu May 3 19:48:23 2018 New Revision: 1830869 URL: http://svn.apache.org/viewvc?rev=1830869=rev Log: Add release date for 8.5.31 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=1830869=1830868=1830869=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu May 3 19:48:23 2018 @@ -70,7 +70,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r26696 - /dev/tomcat/tomcat-8/v8.5.31/ /release/tomcat/tomcat-8/v8.5.31/
Author: markt Date: Thu May 3 19:47:42 2018 New Revision: 26696 Log: Release Apache Tomcat 8.5.31 Added: release/tomcat/tomcat-8/v8.5.31/ - copied from r26695, dev/tomcat/tomcat-8/v8.5.31/ Removed: dev/tomcat/tomcat-8/v8.5.31/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RELEASE] Release Apache Tomcat 8.5.31
The following voters were cast: Binding: +1: markt, remm, schultz, fschumacher No other votes were cast. The vote therefore passes. Thanks to everyone who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r26695 - /dev/tomcat/tomcat-9/v9.0.8/ /release/tomcat/tomcat-9/v9.0.8/
Author: markt Date: Thu May 3 19:44:31 2018 New Revision: 26695 Log: Release Apache Tomcat 9.0.8 Added: release/tomcat/tomcat-9/v9.0.8/ - copied from r26694, dev/tomcat/tomcat-9/v9.0.8/ Removed: dev/tomcat/tomcat-9/v9.0.8/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1830868 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu May 3 19:39:35 2018 New Revision: 1830868 URL: http://svn.apache.org/viewvc?rev=1830868=rev Log: Add release date for 9.0.8 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=1830868=1830867=1830868=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu May 3 19:39:35 2018 @@ -92,7 +92,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 9.0.8
The following votes were cast: Binding: +1: markt, remm, fschumacher The vote therefore passes. Thanks to everyone who contributed towards this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1830867 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/FormAuthenticator.java webapps/docs/changelog.xml
Author: markt Date: Thu May 3 19:32:34 2018 New Revision: 1830867 URL: http://svn.apache.org/viewvc?rev=1830867=rev Log: When restoring a saved request with a request body after FORM authentication, ensure that calls to the HttpServletRequest methods getRequestURI(), getQueryString() and getProtocol() are not corrupted by the processing of the saved request body. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 3 19:32:34 2018 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
svn commit: r1830866 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/authenticator/FormAuthenticator.java webapps/docs/changelog.xml
Author: markt Date: Thu May 3 19:31:57 2018 New Revision: 1830866 URL: http://svn.apache.org/viewvc?rev=1830866=rev Log: When restoring a saved request with a request body after FORM authentication, ensure that calls to the HttpServletRequest methods getRequestURI(), getQueryString() and getProtocol() are not corrupted by the processing of the saved request body. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 3 19:31:57 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215 -/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
svn commit: r1830865 - /tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt Date: Thu May 3 19:25:48 2018 New Revision: 1830865 URL: http://svn.apache.org/viewvc?rev=1830865=rev Log: Remove unnecessary code Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1830865=1830864=1830865=diff == --- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu May 3 19:25:48 2018 @@ -1574,8 +1574,6 @@ public class Http11Processor extends Abs @Override protected final void setRequestBody(ByteChunk body) { InputFilter savedBody = new SavedRequestInputFilter(body); -savedBody.setRequest(request); - Http11InputBuffer internalBuffer = (Http11InputBuffer) request.getInputBuffer(); internalBuffer.addActiveFilter(savedBody); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1830864 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt Date: Thu May 3 19:25:00 2018 New Revision: 1830864 URL: http://svn.apache.org/viewvc?rev=1830864=rev Log: Remove unnecessary code Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1830864=1830863=1830864=diff == --- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu May 3 19:25:00 2018 @@ -1161,8 +1161,6 @@ public class Http11Processor extends Abs @Override protected final void setRequestBody(ByteChunk body) { InputFilter savedBody = new SavedRequestInputFilter(body); -savedBody.setRequest(request); - Http11InputBuffer internalBuffer = (Http11InputBuffer) request.getInputBuffer(); internalBuffer.addActiveFilter(savedBody); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1830862 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/authenticator/FormAuthenticator.java webapps/docs/changelog.xml
Author: markt Date: Thu May 3 19:19:21 2018 New Revision: 1830862 URL: http://svn.apache.org/viewvc?rev=1830862=rev Log: When restoring a saved request with a request body after FORM authentication, ensure that calls to the HttpServletRequest methods getRequestURI(), getQueryString() and getProtocol() are not corrupted by the processing of the saved request body. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 3 19:19:21 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
svn commit: r1830861 - in /tomcat/trunk: java/org/apache/catalina/authenticator/FormAuthenticator.java webapps/docs/changelog.xml
Author: markt Date: Thu May 3 19:18:24 2018 New Revision: 1830861 URL: http://svn.apache.org/viewvc?rev=1830861=rev Log: When restoring a saved request with a request body after FORM authentication, ensure that calls to the HttpServletRequest methods getRequestURI(), getQueryString() and getProtocol() are not corrupted by the processing of the saved request body. Modified: tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1830861=1830860=1830861=diff == --- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Thu May 3 19:18:24 2018 @@ -611,6 +611,18 @@ public class FormAuthenticator } request.getCoyoteRequest().method().setString(method); +// The method, URI, queryString and protocol are normally stored as +// bytes in the HttpInputBuffer and converted lazily to String. At this +// point, the method has already been set as String in the line above +// but the URI, queryString and protocol are still in byte form in the +// HttpInputBuffer. Processing the saved request body will overwrite +// these bytes. Configuring the HttpInputBuffer to retain these bytes as +// it would in a normal request would require some invasive API changes. +// Therefore force the conversion to String now so the correct values +// are presented if the application requests them. +request.getRequestURI(); +request.getQueryString(); +request.getProtocol(); return true; } @@ -702,6 +714,4 @@ public class FormAuthenticator } return sb.toString(); } - - } Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1830861=1830860=1830861=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu May 3 19:18:24 2018 @@ -60,6 +60,13 @@ for a match using JavaBean property names and then, only if a match is not found, look for a match using fields. (markt) + +When restoring a saved request with a request body after FORM +authentication, ensure that calls to the HttpServletRequest +methods getRequestURI(), getQueryString() and +getProtocol() are not corrupted by the processing of the +saved request body. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1830827 - in /tomcat/trunk/java/org/apache: coyote/http2/Http2AsyncUpgradeHandler.java tomcat/util/net/SocketWrapperBase.java tomcat/websocket/server/WsRemoteEndpointImplServer.java
Author: remm Date: Thu May 3 14:43:36 2018 New Revision: 1830827 URL: http://svn.apache.org/viewvc?rev=1830827=rev Log: Refactoring to move common helper class to SocketWrapperBase. Also saves one object creation. Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1830827=1830826=1830827=diff == --- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Thu May 3 14:43:36 2018 @@ -33,9 +33,6 @@ import org.apache.tomcat.util.http.MimeH import org.apache.tomcat.util.net.SendfileState; import org.apache.tomcat.util.net.SocketWrapperBase; import org.apache.tomcat.util.net.SocketWrapperBase.BlockingMode; -import org.apache.tomcat.util.net.SocketWrapperBase.CompletionCheck; -import org.apache.tomcat.util.net.SocketWrapperBase.CompletionHandlerCall; -import org.apache.tomcat.util.net.SocketWrapperBase.CompletionState; public class Http2AsyncUpgradeHandler extends Http2UpgradeHandler { @@ -307,7 +304,7 @@ public class Http2AsyncUpgradeHandler ex ByteUtil.set31Bits(header, 5, sendfile.stream.getIdentifier().intValue()); sendfile.mappedBuffer.limit(sendfile.mappedBuffer.position() + frameSize); socketWrapper.write(BlockingMode.SEMI_BLOCK, protocol.getWriteTimeout(), -TimeUnit.MILLISECONDS, sendfile, COMPLETE_WRITE_WITH_COMPLETION, +TimeUnit.MILLISECONDS, sendfile, SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION, new SendfileCompletionHandler(), ByteBuffer.wrap(header), sendfile.mappedBuffer); try { handleAsyncException(); @@ -321,19 +318,6 @@ public class Http2AsyncUpgradeHandler ex } } -private static final CompletionCheck COMPLETE_WRITE_WITH_COMPLETION = new CompletionCheck() { -@Override -public CompletionHandlerCall callHandler(CompletionState state, ByteBuffer[] buffers, -int offset, int length) { -for (int i = 0; i < length; i++) { -if (buffers[offset + i].remaining() > 0) { -return CompletionHandlerCall.CONTINUE; -} -} -return CompletionHandlerCall.DONE; -} -}; - protected class SendfileCompletionHandler implements CompletionHandler{ @Override public void completed(Long nBytes, SendfileData sendfile) { @@ -381,7 +365,7 @@ public class Http2AsyncUpgradeHandler ex ByteUtil.set31Bits(header, 5, sendfile.stream.getIdentifier().intValue()); sendfile.mappedBuffer.limit(sendfile.mappedBuffer.position() + frameSize); socketWrapper.write(BlockingMode.SEMI_BLOCK, protocol.getWriteTimeout(), -TimeUnit.MILLISECONDS, sendfile, COMPLETE_WRITE_WITH_COMPLETION, +TimeUnit.MILLISECONDS, sendfile, SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION, this, ByteBuffer.wrap(header), sendfile.mappedBuffer); try { handleAsyncException(); 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=1830827=1830826=1830827=diff == --- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Thu May 3 14:43:36 2018 @@ -868,6 +868,23 @@ public abstract class SocketWrapperBase< }; /** + * This utility CompletionCheck will cause the write to fully write + * all remaining data. The completion handler will then be called. + */ +public static final CompletionCheck COMPLETE_WRITE_WITH_COMPLETION = new CompletionCheck() { +@Override +public CompletionHandlerCall callHandler(CompletionState state, ByteBuffer[] buffers, +int offset, int length) { +for (int i = 0; i < length; i++) { +if (buffers[offset + i].remaining() > 0) { +return CompletionHandlerCall.CONTINUE; +} +} +return CompletionHandlerCall.DONE; +} +}; + +/** * This utility CompletionCheck will cause the completion handler
Re[2]: Apache Tomcat and JPMS
Could you say why such plans doesn't exist? Maybe it is necessary to open an issue with JPMS support suggestion? >Четверг, 3 мая 2018, 14:37 +03:00 от Mark Thomas: > >On 03/05/18 12:19, Alex Sviridov wrote: >> Hi all, >> >> Could anyone say if there are any plans to migrate Apache Tomcat to JPMS. I >> mean >> to make Tomcat modular according to JPMS. > >I'm not aware of any such plans. > >Mark > >- >To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >For additional commands, e-mail: dev-h...@tomcat.apache.org > -- Alex Sviridov
Re: Apache Tomcat and JPMS
On 03/05/18 12:19, Alex Sviridov wrote: > Hi all, > > Could anyone say if there are any plans to migrate Apache Tomcat to JPMS. I > mean > to make Tomcat modular according to JPMS. I'm not aware of any such plans. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Apache Tomcat and JPMS
Hi all, Could anyone say if there are any plans to migrate Apache Tomcat to JPMS. I mean to make Tomcat modular according to JPMS. -- Best regards. Alex Sviridov
svn commit: r1830812 - /tomcat/trunk/webapps/docs/changelog.xml
Author: remm Date: Thu May 3 10:45:43 2018 New Revision: 1830812 URL: http://svn.apache.org/viewvc?rev=1830812=rev Log: Add changelog as the prequel fix was in 9.0.8. 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=1830812=1830811=1830812=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu May 3 10:45:43 2018 @@ -72,6 +72,9 @@ Consistent exception propagation for NIO2 SSL close. (remm) + +Followup sync fix for NIO2 async IO blocking read/writes. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1830809 - in /tomcat/trunk: java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java webapps/docs/changelog.xml
Author: remm Date: Thu May 3 09:54:35 2018 New Revision: 1830809 URL: http://svn.apache.org/viewvc?rev=1830809=rev Log: Second attempt. Add async IO API use in websockets writes. Although I doubt there's an actual benefit at the moment, the change is small and it still improves testing of the API as the usage is different from HTTP/2. Tested with the testsuite, the examples and Autobahn. Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1830809=1830808=1830809=diff == --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java Thu May 3 09:54:35 2018 @@ -20,7 +20,10 @@ import java.io.EOFException; import java.io.IOException; import java.net.SocketTimeoutException; import java.nio.ByteBuffer; +import java.nio.channels.CompletionHandler; +import java.nio.channels.InterruptedByTimeoutException; import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; import javax.websocket.SendHandler; import javax.websocket.SendResult; @@ -28,6 +31,10 @@ import javax.websocket.SendResult; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.net.SocketWrapperBase; +import org.apache.tomcat.util.net.SocketWrapperBase.BlockingMode; +import org.apache.tomcat.util.net.SocketWrapperBase.CompletionCheck; +import org.apache.tomcat.util.net.SocketWrapperBase.CompletionHandlerCall; +import org.apache.tomcat.util.net.SocketWrapperBase.CompletionState; import org.apache.tomcat.util.res.StringManager; import org.apache.tomcat.websocket.Transformation; import org.apache.tomcat.websocket.WsRemoteEndpointImplBase; @@ -65,16 +72,92 @@ public class WsRemoteEndpointImplServer @Override protected void doWrite(SendHandler handler, long blockingWriteTimeoutExpiry, ByteBuffer... buffers) { -if (blockingWriteTimeoutExpiry == -1) { -this.handler = handler; -this.buffers = buffers; -// This is definitely the same thread that triggered the write so a -// dispatch will be required. -onWritePossible(true); +if (socketWrapper.hasAsyncIO()) { +final boolean block = (blockingWriteTimeoutExpiry != -1); +long timeout = -1; +if (block) { +timeout = blockingWriteTimeoutExpiry - System.currentTimeMillis(); +if (timeout <= 0) { +SendResult sr = new SendResult(new SocketTimeoutException()); +handler.onResult(sr); +return; +} +} else { +this.handler = handler; +if (timeout > 0) { +// Register with timeout thread +timeoutExpiry = timeout + System.currentTimeMillis(); +wsWriteTimeout.register(this); +} +timeout = getSendTimeout(); +} +socketWrapper.write(block ? BlockingMode.BLOCK : BlockingMode.SEMI_BLOCK, timeout, +TimeUnit.MILLISECONDS, null, +new CompletionCheck() { +@Override +public CompletionHandlerCall callHandler(CompletionState state, ByteBuffer[] buffers, +int offset, int length) { +for (int i = 0; i < length; i++) { +if (buffers[offset + i].remaining() > 0) { +return CompletionHandlerCall.CONTINUE; +} +} +return CompletionHandlerCall.DONE; +} +}, +new CompletionHandler() { +@Override +public void completed(Long result, Void attachment) { +if (block) { +long timeout = blockingWriteTimeoutExpiry - System.currentTimeMillis(); +if (timeout <= 0) { +failed(new SocketTimeoutException(), null); +} else { +handler.onResult(SENDRESULT_OK); +} +} else { + wsWriteTimeout.unregister(WsRemoteEndpointImplServer.this); +
svn commit: r1830808 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: remm Date: Thu May 3 09:44:21 2018 New Revision: 1830808 URL: http://svn.apache.org/viewvc?rev=1830808=rev Log: r1830355 part 2. I'll then try again r1830592 in CI. Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1830808=1830807=1830808=diff == --- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu May 3 09:44:21 2018 @@ -907,7 +907,6 @@ public class Nio2Endpoint extends Abstra boolean notify = false; readPending.release(); if (state.block == BlockingMode.BLOCK && currentState != CompletionState.INLINE) { -state.state = currentState; notify = true; } else { state.state = currentState; @@ -917,6 +916,7 @@ public class Nio2Endpoint extends Abstra } if (notify) { synchronized (state) { +state.state = currentState; state.notify(); } } @@ -939,7 +939,6 @@ public class Nio2Endpoint extends Abstra readPending.release(); readPending.release(); if (state.block == BlockingMode.BLOCK) { -state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE; notify = true; } else { state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE; @@ -953,6 +952,7 @@ public class Nio2Endpoint extends Abstra } if (notify) { synchronized (state) { +state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE; state.notify(); } } @@ -985,7 +985,6 @@ public class Nio2Endpoint extends Abstra boolean notify = false; writePending.release(); if (state.block == BlockingMode.BLOCK && currentState != CompletionState.INLINE) { -state.state = currentState; notify = true; } else { state.state = currentState; @@ -995,6 +994,7 @@ public class Nio2Endpoint extends Abstra } if (notify) { synchronized (state) { +state.state = currentState; state.notify(); } } @@ -1016,7 +1016,6 @@ public class Nio2Endpoint extends Abstra boolean notify = false; writePending.release(); if (state.block == BlockingMode.BLOCK) { -state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE; notify = true; } else { state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE; @@ -1026,6 +1025,7 @@ public class Nio2Endpoint extends Abstra } if (notify) { synchronized (state) { +state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE; state.notify(); } } - 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
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/3232 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] 1830802 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1830807 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Author: markt Date: Thu May 3 09:29:09 2018 New Revision: 1830807 URL: http://svn.apache.org/viewvc?rev=1830807=rev Log: Java 6 compat Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1830807=1830806=1830807=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Thu May 3 09:29:09 2018 @@ -291,7 +291,7 @@ public class DefaultInstanceManager impl InvocationTargetException, NamingException { List annotations = null; -Set injectionsMatchedToSetter = new HashSet<>(); +Set injectionsMatchedToSetter = new HashSet(); while (clazz != null) { AnnotationCacheEntry[] annotationsArray = annotationCache.get(clazz); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1830806 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java webapps/docs/changelog.xml
Author: markt Date: Thu May 3 09:28:41 2018 New Revision: 1830806 URL: http://svn.apache.org/viewvc?rev=1830806=rev Log: Correct the processing of resources with s defined in web.xml. First look for a match using JavaBean property names and then, only if a match is not found, look for a match using fields. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 3 09:28:41 2018 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
svn commit: r1830805 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
Author: markt Date: Thu May 3 09:26:42 2018 New Revision: 1830805 URL: http://svn.apache.org/viewvc?rev=1830805=rev Log: Fix indent Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1830805=1830804=1830805=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Thu May 3 09:26:42 2018 @@ -108,707 +108,707 @@ public class DefaultInstanceManager impl private final Set restrictedClasses; private final ManagedConcurrentWeakHashMapannotationCache = new ManagedConcurrentWeakHashMap (); -private final Map postConstructMethods; -private final Map preDestroyMethods; +private final Map postConstructMethods; +private final Map preDestroyMethods; -public DefaultInstanceManager(Context context, Map > injectionMap, org.apache.catalina.Context catalinaContext, ClassLoader containerClassLoader) { -classLoader = catalinaContext.getLoader().getClassLoader(); -privileged = catalinaContext.getPrivileged(); -this.containerClassLoader = containerClassLoader; -ignoreAnnotations = catalinaContext.getIgnoreAnnotations(); -Log log = catalinaContext.getLogger(); -Set classNames = new HashSet(); -loadProperties(classNames, - "org/apache/catalina/core/RestrictedServlets.properties", -"defaultInstanceManager.restrictedServletsResource", log); -loadProperties(classNames, - "org/apache/catalina/core/RestrictedListeners.properties", -"defaultInstanceManager.restrictedListenersResource", log); -loadProperties(classNames, - "org/apache/catalina/core/RestrictedFilters.properties", -"defaultInstanceManager.restrictedFiltersResource", log); -restrictedClasses = Collections.unmodifiableSet(classNames); -this.context = context; -this.injectionMap = injectionMap; -this.postConstructMethods = catalinaContext.findPostConstructMethods(); -this.preDestroyMethods = catalinaContext.findPreDestroyMethods(); -} - -@Override -public Object newInstance(Class clazz) throws IllegalAccessException, -InvocationTargetException, NamingException, InstantiationException, -IllegalArgumentException, NoSuchMethodException, SecurityException { -return newInstance(clazz.getDeclaredConstructor().newInstance(), clazz); -} - -@Override -public Object newInstance(String className) throws IllegalAccessException, -InvocationTargetException, NamingException, InstantiationException, -ClassNotFoundException, IllegalArgumentException, NoSuchMethodException, SecurityException { -Class clazz = loadClassMaybePrivileged(className, classLoader); -return newInstance(clazz.getDeclaredConstructor().newInstance(), clazz); -} - -@Override -public Object newInstance(final String className, final ClassLoader classLoader) -throws IllegalAccessException, NamingException, InvocationTargetException, -InstantiationException, ClassNotFoundException, IllegalArgumentException, -NoSuchMethodException, SecurityException { -Class clazz = classLoader.loadClass(className); -return newInstance(clazz.getDeclaredConstructor().newInstance(), clazz); -} - -@Override -public void newInstance(Object o) -throws IllegalAccessException, InvocationTargetException, NamingException { -newInstance(o, o.getClass()); -} - -private Object newInstance(Object instance, Class clazz) throws IllegalAccessException, InvocationTargetException, NamingException { -if (!ignoreAnnotations) { -Map injections = assembleInjectionsFromClassHierarchy(clazz); -populateAnnotationsCache(clazz, injections); -processAnnotations(instance, injections); -postConstruct(instance, clazz); -
svn commit: r1830804 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java webapps/docs/changelog.xml
Author: markt Date: Thu May 3 09:23:11 2018 New Revision: 1830804 URL: http://svn.apache.org/viewvc?rev=1830804=rev Log: Correct the processing of resources with s defined in web.xml. First look for a match using JavaBean property names and then, only if a match is not found, look for a match using fields. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 3 09:23:11 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215 -/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
svn commit: r1830803 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java webapps/docs/changelog.xml
Author: markt Date: Thu May 3 09:22:05 2018 New Revision: 1830803 URL: http://svn.apache.org/viewvc?rev=1830803=rev Log: Correct the processing of resources with s defined in web.xml. First look for a match using JavaBean property names and then, only if a match is not found, look for a match using fields. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 3 09:22:05 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
svn commit: r1830802 - in /tomcat/trunk: java/org/apache/catalina/core/DefaultInstanceManager.java webapps/docs/changelog.xml
Author: markt Date: Thu May 3 09:14:02 2018 New Revision: 1830802 URL: http://svn.apache.org/viewvc?rev=1830802=rev Log: Correct the processing of resources with s defined in web.xml. First look for a match using JavaBean property names and then, only if a match is not found, look for a match using fields. Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1830802=1830801=1830802=diff == --- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Thu May 3 09:14:02 2018 @@ -298,6 +298,7 @@ public class DefaultInstanceManager impl InvocationTargetException, NamingException { List annotations = null; +Set injectionsMatchedToSetter = new HashSet<>(); while (clazz != null) { AnnotationCacheEntry[] annotationsArray = annotationCache.get(clazz); @@ -308,48 +309,6 @@ public class DefaultInstanceManager impl annotations.clear(); } -if (context != null) { -// Initialize fields annotations for resource injection if -// JNDI is enabled -Field[] fields = Introspection.getDeclaredFields(clazz); -for (Field field : fields) { -Resource resourceAnnotation; -Annotation ejbAnnotation; -Annotation webServiceRefAnnotation; -Annotation persistenceContextAnnotation; -Annotation persistenceUnitAnnotation; -if (injections != null && injections.containsKey(field.getName())) { -annotations.add(new AnnotationCacheEntry( -field.getName(), null, -injections.get(field.getName()), -AnnotationCacheEntryType.FIELD)); -} else if ((resourceAnnotation = -field.getAnnotation(Resource.class)) != null) { -annotations.add(new AnnotationCacheEntry(field.getName(), null, -resourceAnnotation.name(), AnnotationCacheEntryType.FIELD)); -} else if (EJB_PRESENT && -(ejbAnnotation = field.getAnnotation(EJB.class)) != null) { -annotations.add(new AnnotationCacheEntry(field.getName(), null, -((EJB) ejbAnnotation).name(), AnnotationCacheEntryType.FIELD)); -} else if (WS_PRESENT && (webServiceRefAnnotation = -field.getAnnotation(WebServiceRef.class)) != null) { -annotations.add(new AnnotationCacheEntry(field.getName(), null, -((WebServiceRef) webServiceRefAnnotation).name(), -AnnotationCacheEntryType.FIELD)); -} else if (JPA_PRESENT && (persistenceContextAnnotation = -field.getAnnotation(PersistenceContext.class)) != null) { -annotations.add(new AnnotationCacheEntry(field.getName(), null, -((PersistenceContext) persistenceContextAnnotation).name(), -AnnotationCacheEntryType.FIELD)); -} else if (JPA_PRESENT && (persistenceUnitAnnotation = -field.getAnnotation(PersistenceUnit.class)) != null) { -annotations.add(new AnnotationCacheEntry(field.getName(), null, -((PersistenceUnit) persistenceUnitAnnotation).name(), -AnnotationCacheEntryType.FIELD)); -} -} -} - // Initialize methods annotations Method[] methods = Introspection.getDeclaredMethods(clazz); Method postConstruct = null; @@ -359,9 +318,9 @@ public class DefaultInstanceManager impl for (Method method : methods) { if (context != null) { // Resource injection only if JNDI is enabled -if (injections != null && -Introspection.isValidSetter(method)) { +if (injections != null && Introspection.isValidSetter(method)) {
Re: [VOTE] Release Apache Tomcat 8.5.31
On 02/05/18 22:04, Christopher Schultz wrote: > Checkstyle doesn't like one of the bundled XML files because the first > line doesn't contain "Apache" (it's "). Which one? Checkstyle passed for me. I wonder what is going on. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.31
Am 27. April 2018 22:47:53 MESZ schrieb Mark Thomas: >The proposed Apache Tomcat 8.5.31 release is now available for voting. > >The major changes compared to the 8.5.30 release are: > >- Implement configuration options to work-around specification > non-compliant user agents (including all the major browsers) that do > not correctly %nn encode URI paths and query strings as required by > RFC 7230 and RFC 3986 > >- Enable the CrawlerSessionManagerValve to correctly handle bots that > crawl multiple hosts and/or web applications when the Valve is > configured on a Host or an Engine. > >- Add support for annotation scanning of classes built with Java 11 EA > >Along with lots of other bug fixes and improvements. > > >It can be obtained from: >https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.31/ >The Maven staging repo is: >https://repository.apache.org/content/repositories/orgapachetomcat-1181/ >The svn tag is: >http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_31/ > >The proposed 8.5.31 release is: >[ ] Broken - do not release >[x] Stable - go ahead and release as 8.5.31 Regards, Felix > >- >To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org