Re: Time for 8.5.36?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 All, Just confirming that I did indeed send the below message. I was having a problem with gpg-agent on my laptop and getting really weird errors when attempting to sign the message. Thanks, - -chris On 12/11/18 22:57, Christopher Schultz wrote: > All, > > On 12/11/18 08:21, Mark Thomas wrote: >> Chris, >> >> Are you still interested in being RM for this? > > I don't think I'm quite ready to take over for 8.5.36, but I would > like to work towards it. > > I haven't been able to get the build to run 100% in my Windows VM > yet. > > This time around, I'll see what I can accomplish and ask for help > replicating what is actually done (presumably by you). > > Has anyone experimented with code-signing without actually copying > the GPG key into the VM? I've been having no luck using gpg-agent > via ssh in other contexts, so I assume that I'll just have to > install my GPG key into the actual VM. I was hoping to build a > script that could start with an empty VM and produce a set of > artifacts for release. That may be a tall order. > > Thanks, -chris > > - > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > -BEGIN PGP SIGNATURE- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlwQiFEACgkQHPApP6U8 pFjd1w//TpFl6u7uG9mTWWi1Gxh9eei4YP58hyVb9EHS8thXcyet4t4eF6jHI9kO X7SRqEBl3JQpPBhp8GfQIKsczEuiP4OgrBnI+5dmRL2u3zrsO4YtSn5pNi/swiht rkQ0YD61C9l8mr0oA3K7iTQ37Bh5sWeSVF7rGcHSQKzM+IqVtF5BMHrA3oYnzXCg OGnLd8BEFAgmqLZxyvIYmaDXiQKSQjHX3lHnExO5M8KwCR4EihyvpMUSqEbqn3MP h49I9EzO5qU4bE37FC/3xle1mxNRXqcQwsoHw9NcIm1PcDhVIYvofku/T9ROXqJ1 9v4H5NPXFwqS8gwOB79559speoZcCTzU8wEPP8skPFApvJps9DXEOBI3oSUwnvT1 149FpnHX7D7YhuNR66P3w8320zGUvgVDhyJtVeiK2CEnhjS/Op5Ljoj3W5Cx4eHx az01b5R9Lgzoo7prIBBZVN6rn5teOa5QGuJbxQ4C+O4Uf7hnPsVV0MDTN7Su2E2X kUTJu7AVCmSc6ILc8RkvZKODV+zKFakQ45DwYTFQGxX6ShNczGdcSdS4sQQiWaNz Fi1JDCQbZF1By/Iao7yXZimHMtvL9EtRWYXNMi5c/ai1glfBEmyfjY6N8AIFXB5s VICSdb8v5IFDjPDWHucca3YxlWs+U2u+q1i2TITLXxGmqK47Swo= =0ArC -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for 8.5.36?
All, On 12/11/18 08:21, Mark Thomas wrote: > Chris, > > Are you still interested in being RM for this? I don't think I'm quite ready to take over for 8.5.36, but I would like to work towards it. I haven't been able to get the build to run 100% in my Windows VM yet. This time around, I'll see what I can accomplish and ask for help replicating what is actually done (presumably by you). Has anyone experimented with code-signing without actually copying the GPG key into the VM? I've been having no luck using gpg-agent via ssh in other contexts, so I assume that I'll just have to install my GPG key into the actual VM. I was hoping to build a script that could start with an empty VM and produce a set of artifacts for release. That may be a tall order. Thanks, -chris - 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/3883 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] 1848709 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
[Bug 62978] RemoteIpValve: Multiple forwards in X-Forwarded-Proto header not supported
https://bz.apache.org/bugzilla/show_bug.cgi?id=62978 --- Comment #4 from Mark Thomas --- Patch applied. Thanks for the attention to detail. It is much appreciated. -- 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: r1848711 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/valves/TestRemoteIpValve.java
Author: markt Date: Tue Dec 11 20:13:31 2018 New Revision: 1848711 URL: http://svn.apache.org/viewvc?rev=1848711&view=rev Log: Correct test names Patch provided by Tom Groot Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 11 20:13:31 2018 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,1826690,1826830,182
svn commit: r1848710 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/catalina/valves/TestRemoteIpValve.java
Author: markt Date: Tue Dec 11 20:12:31 2018 New Revision: 1848710 URL: http://svn.apache.org/viewvc?rev=1848710&view=rev Log: Correct test names Patch provided by Tom Groot Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 11 20:12:31 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,17635
svn commit: r1848709 - /tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
Author: markt
Date: Tue Dec 11 20:11:34 2018
New Revision: 1848709
URL: http://svn.apache.org/viewvc?rev=1848709&view=rev
Log:
Correct test names
Patch provided by Tom Groot
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
Modified: tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java?rev=1848709&r1=1848708&r2=1848709&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestRemoteIpValve.java Tue Dec
11 20:11:34 2018
@@ -694,7 +694,7 @@ public class TestRemoteIpValve {
}
@Test
-public void
testInvokeXforwardedProtoSaysMultipleForwardsWithLastBeingHttpForIncomingHttpsRequest()
throws Exception {
+public void
testInvokeXforwardedProtoSaysMultipleForwardsWithLastBeingHttpForIncomingHttpRequest()
throws Exception {
performXForwardedProtoWithMultipleForwardsTest("https,http", false,
false);
}
@@ -704,12 +704,12 @@ public class TestRemoteIpValve {
}
@Test
-public void
testInvokeXforwardedProtoSaysMultipleHttpForwardsForIncomingHttpsRequest()
throws Exception {
+public void
testInvokeXforwardedProtoSaysMultipleHttpForwardsForIncomingHttpRequest()
throws Exception {
performXForwardedProtoWithMultipleForwardsTest("http,http", false,
false);
}
@Test
-public void
testInvokeXforwardedProtoSaysInvalidValueForIncomingHttpsRequest() throws
Exception {
+public void
testInvokeXforwardedProtoSaysInvalidValueForIncomingHttpRequest() throws
Exception {
performXForwardedProtoWithMultipleForwardsTest(",", false, false);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63003] New: Tomcat is closing async connection prematurely when shutdown is initiated.
https://bz.apache.org/bugzilla/show_bug.cgi?id=63003 Bug ID: 63003 Summary: Tomcat is closing async connection prematurely when shutdown is initiated. Product: Tomcat 7 Version: 7.0.68 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: i.mochu...@gmail.com Target Milestone: --- I am heavily using asynchronous API in my application, which is running on Tomcat 7. One of the requirements that I have -- permit all requests that are currently in flight to complete their work before termination. I have unloadDelay set in my context.xml: Also I have the following properties set for each of my connectors in server.xml: asyncTimeout="4" executorTerminationTimeoutMillis="6" I have thrown a 10 seconds sleep into one of my services and I place a curl request against my server, then immediately I request a shutdown of a tomcat service. Curl returns with: * Recv failure: Connection reset by peer * Closing connection 1 curl: (56) Recv failure: Connection reset by peer And in the catalina.out I see the following output: Dec 11, 2018 5:14:46 PM org.apache.coyote.AbstractProtocol pause INFO: Pausing ProtocolHandler ["http-nio-8443"] Dec 11, 2018 5:14:46 PM org.apache.coyote.AbstractProtocol pause INFO: Pausing ProtocolHandler ["http-nio-9082"] Dec 11, 2018 5:14:46 PM org.apache.coyote.AbstractProtocol pause INFO: Pausing ProtocolHandler ["http-nio-9080"] Dec 11, 2018 5:14:46 PM org.apache.catalina.core.StandardService stopInternal INFO: Stopping service Catalina Dec 11, 2018 5:14:46 PM org.apache.catalina.core.StandardWrapper unload INFO: Waiting for 1 instance(s) to be deallocated for Servlet [mvc-dispatcher] Dec 11, 2018 5:15:07 PM org.apache.catalina.connector.CoyoteAdapter checkRecycled INFO: Encountered a non-recycled request and recycled it forcedly. org.apache.catalina.connector.CoyoteAdapter$RecycleRequiredException at org.apache.catalina.connector.CoyoteAdapter.checkRecycled(CoyoteAdapter.java:608) at org.apache.coyote.http11.AbstractHttp11Processor.recycle(AbstractHttp11Processor.java:1811) at org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.release(Http11NioProtocol.java:218) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:708) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1761) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1720) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:745) Dec 11, 2018 5:15:27 PM org.apache.catalina.loader.WebappClassLoaderBase clearReferencesThreads SEVERE: The web application [] appears to have started a thread named [FileWatchdog] but has failed to stop it. This is very likely to create a memory leak. Dec 11, 2018 5:15:27 PM org.apache.catalina.loader.WebappClassLoaderBase clearReferencesThreads SEVERE: The web application [] appears to have started a thread named [Thread-8] but has failed to stop it. This is very likely to create a memory leak. Dec 11, 2018 5:15:27 PM org.apache.catalina.loader.WebappClassLoaderBase clearReferencesThreads SEVERE: The web application [] appears to have started a thread named [threadDeathWatcher-2-1] but has failed to stop it. This is very likely to create a memory leak. It seems that unloadDelay and other timeout properties are not being honored. -- 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: r1848696 - in /tomcat/trunk/java/org/apache: catalina/mbeans/ tomcat/util/modeler/ tomcat/util/modeler/modules/
Author: remm
Date: Tue Dec 11 16:46:24 2018
New Revision: 1848696
URL: http://svn.apache.org/viewvc?rev=1848696&view=rev
Log:
Add i18n for modeler package, and fix package name for mbeans strings.
Added:
tomcat/trunk/java/org/apache/tomcat/util/modeler/LocalStrings.properties
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java?rev=1848696&r1=1848695&r2=1848696&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java Tue Dec 11
16:46:24 2018
@@ -24,6 +24,7 @@ import javax.management.RuntimeOperation
import org.apache.catalina.connector.Connector;
import org.apache.tomcat.util.IntrospectionUtils;
+import org.apache.tomcat.util.res.StringManager;
/**
* A ModelMBean implementation for the
@@ -33,6 +34,8 @@ import org.apache.tomcat.util.Introspect
*/
public class ConnectorMBean extends ClassNameMBean {
+private static final StringManager sm =
StringManager.getManager(ConnectorMBean.class);
+
/**
* Obtain and return the value of a specific attribute of this MBean.
*
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java?rev=1848696&r1=1848695&r2=1848696&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
Tue Dec 11 16:46:24 2018
@@ -24,6 +24,7 @@ import javax.management.RuntimeOperation
import org.apache.tomcat.util.descriptor.web.ContextResourceLink;
import org.apache.tomcat.util.descriptor.web.NamingResources;
+import org.apache.tomcat.util.res.StringManager;
/**
* A ModelMBean implementation for the
@@ -33,6 +34,8 @@ import org.apache.tomcat.util.descriptor
*/
public class ContextResourceLinkMBean extends
BaseCatalinaMBean {
+private static final StringManager sm =
StringManager.getManager(ContextResourceLinkMBean.class);
+
/**
* Obtain and return the value of a specific attribute of this MBean.
*
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java?rev=1848696&r1=1848695&r2=1848696&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java Tue
Dec 11 16:46:24 2018
@@ -24,6 +24,7 @@ import javax.management.RuntimeOperation
import org.apache.tomcat.util.descriptor.web.ContextResource;
import org.apache.tomcat.util.descriptor.web.NamingResources;
+import org.apache.tomcat.util.res.StringManager;
/**
* A ModelMBean implementation for the
@@ -33,6 +34,8 @@ import org.apache.tomcat.util.descriptor
*/
public class ContextResourceMBean extends BaseCatalinaMBean {
+private static final StringManager sm =
StringManager.getManager(ContextResourceMBean.class);
+
/**
* Obtain and return the value of a specific attribute of this MBean.
*
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java?rev=1848696&r1=1848695&r2=1848696&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/m
svn commit: r1848691 - in /tomcat/trunk/java/org/apache/tomcat/util: buf/ codec/binary/ digester/ security/ threads/ threads/res/
Author: remm
Date: Tue Dec 11 15:09:26 2018
New Revision: 1848691
URL: http://svn.apache.org/viewvc?rev=1848691&view=rev
Log:
Add i18n for various util packages.
Added:
tomcat/trunk/java/org/apache/tomcat/util/codec/binary/LocalStrings.properties
(with props)
tomcat/trunk/java/org/apache/tomcat/util/security/LocalStrings.properties
(with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
tomcat/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
tomcat/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
tomcat/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java?rev=1848691&r1=1848690&r2=1848691&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/AbstractChunk.java Tue Dec 11
15:09:26 2018
@@ -18,12 +18,15 @@ package org.apache.tomcat.util.buf;
import java.io.Serializable;
+import org.apache.tomcat.util.res.StringManager;
+
/**
* Base class for the *Chunk implementation to reduce duplication.
*/
public abstract class AbstractChunk implements Cloneable, Serializable {
private static final long serialVersionUID = 1L;
+protected static final StringManager sm =
StringManager.getManager(AbstractChunk.class);
/*
* JVMs may limit the maximum array size to slightly less than
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1848691&r1=1848690&r2=1848691&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Dec 11
15:09:26 2018
@@ -512,7 +512,7 @@ public final class ByteChunk extends Abs
public void flushBuffer() throws IOException {
// assert out!=null
if (out == null) {
-throw new IOException("Buffer overflow, no sink " + getLimit() + "
" + buff.length);
+throw new IOException(sm.getString("chunk.overflow", getLimit(),
buff.length));
}
out.realWriteBytes(buff, start, end - start);
end = start;
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1848691&r1=1848690&r2=1848691&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Dec 11
15:09:26 2018
@@ -353,7 +353,7 @@ public final class CharChunk extends Abs
public void flushBuffer() throws IOException {
// assert out!=null
if (out == null) {
-throw new IOException("Buffer overflow, no sink " + getLimit() + "
" + buff.length);
+throw new IOException(sm.getString("chunk.overflow", getLimit(),
buff.length));
}
out.realWriteChars(buff, start, end - start);
end = start;
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties?rev=1848691&r1=1848690&r2=1848691&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/LocalStrings.properties
[UTF-8] Tue Dec 11 15:09:26 2018
@@ -19,9 +19,13 @@ byteBufferUtils.cleaner=Cannot use direc
c2bConverter.recycleFailed
svn commit: r1848687 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/deploy/LocalStrings.properties java/org/apache/catalina/deploy/WebXml.java java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Tue Dec 11 14:29:27 2018
New Revision: 1848687
URL: http://svn.apache.org/viewvc?rev=1848687&view=rev
Log:
Implement the requirements of section 8.2.2 2c of the Servlet specification and
prevent a web application from deploying if it has fragments with duplicate
names and is configured to use relative ordering of fragments.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties?rev=1848687&r1=1848686&r2=1848687&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties
Tue Dec 11 14:29:27 2018
@@ -19,6 +19,7 @@ servletDef.invalidServletName=Invalid http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1848687&r1=1848686&r2=1848687&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java Tue Dec 11
14:29:27 2018
@@ -76,6 +76,19 @@ public class WebXml {
this.overridable = overridable;
}
+/*
+ * Ideally, fragment names will be unique. If they are not, Tomcat needs
+ * to know as the action that the specification requires (see 8.2.2 1.e and
+ * 2.c) varies depending on the ordering method used.
+ */
+private boolean duplicated = false;
+public boolean isDuplicated() {
+return duplicated;
+}
+public void setDuplicated(boolean duplicated) {
+this.duplicated = duplicated;
+}
+
// web.xml only elements
// Absolute Ordering
private Set absoluteOrdering = null;
@@ -2319,6 +2332,13 @@ public class WebXml {
}
}
} else {
+// Stage 0. Check there were no fragments with duplicate names
+for (WebXml fragment : fragments.values()) {
+if (fragment.isDuplicated()) {
+throw new IllegalArgumentException(
+sm.getString("webXml.duplicateFragment",
fragment.getName()));
+}
+}
// Stage 1. Make all dependencies bi-directional - this makes the
// next stage simpler.
for (WebXml fragment : fragments.values()) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1848687&r1=1848686&r2=1848687&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Tue Dec 11 14:29:27 2018
@@ -2699,12 +2699,7 @@ public class ContextConfig implements Li
if (jar != null) {
jar.close();
}
-fragment.setURL(url);
-if (fragment.getName() == null) {
-fragment.setName(fragment.getURL().toString());
-}
-fragment.setJarName(extractJarFileName(url));
-fragments.put(fragment.getName(), fragment);
+addFragment(fragment, url);
}
}
@@ -2745,13 +2740,26 @@ public class ContextConfig implements Li
} catch (IOException e) {
}
}
-fragment.setURL(file.toURI().toURL());
-if (fragment.getName() == null) {
-fragment.setName(fragment.getURL().toString());
-}
-fragment.setJarName(file.getName());
-fragments.put(fragment.getName(), fragment);
+addFragment(fragment, file.toURI().toURL());
+}
+}
+
+private void addFragment(WebXml fragment, URL url) {
+fragment.setURL(url);
+if (fragment.getName() == null) {
+fragment.setName(url.toString());
}
+fragment.setJarName(extractJarFileName(url));
+if (fragments.containsKey(fragment.getName())) {
+// Duplicate. Mark the fragment that has already been found
with
+// this name as having a duplicate so Tomcat can handle it
+// c
svn commit: r1848684 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
Author: markt Date: Tue Dec 11 14:14:34 2018 New Revision: 1848684 URL: http://svn.apache.org/viewvc?rev=1848684&view=rev Log: Improve fix for duplicate fragment name Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 11 14:14:34 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565
svn commit: r1848682 - /tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
Author: markt
Date: Tue Dec 11 14:10:30 2018
New Revision: 1848682
URL: http://svn.apache.org/viewvc?rev=1848682&view=rev
Log:
Improve fix for duplicate fragment name
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java?rev=1848682&r1=1848681&r2=1848682&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
Tue Dec 11 14:10:30 2018
@@ -79,22 +79,7 @@ public class FragmentJarScannerCallback
}
}
} finally {
-fragment.setURL(jar.getJarFileURL());
-if (fragment.getName() == null) {
-fragment.setName(fragment.getURL().toString());
-}
-fragment.setJarName(extractJarFileName(jar.getJarFileURL()));
-if (fragments.containsKey(fragment.getName())) {
-// Duplicate. Mark the fragment that has already been found
with
-// this name as having a duplicate so Tomcat can handle it
-// correctly when the fragments are being ordered.
-String duplicateName = fragment.getName();
-fragments.get(duplicateName).setDuplicated(true);
-// Rename the current fragment so it doesn't clash
-fragment.setName(fragment.getURL().toString());
-} else {
-fragments.put(fragment.getName(), fragment);
-}
+addFragment(fragment, jar.getJarFileURL());
}
}
@@ -135,13 +120,27 @@ public class FragmentJarScannerCallback
fragment.setDistributable(true);
}
} finally {
-fragment.setURL(file.toURI().toURL());
-if (fragment.getName() == null) {
-fragment.setName(fragment.getURL().toString());
-}
-fragment.setJarName(file.getName());
-fragments.put(fragment.getName(), fragment);
+addFragment(fragment, file.toURI().toURL());
+}
+}
+
+
+private void addFragment(WebXml fragment, URL url) {
+fragment.setURL(url);
+if (fragment.getName() == null) {
+fragment.setName(url.toString());
+}
+fragment.setJarName(extractJarFileName(url));
+if (fragments.containsKey(fragment.getName())) {
+// Duplicate. Mark the fragment that has already been found with
+// this name as having a duplicate so Tomcat can handle it
+// correctly when the fragments are being ordered.
+String duplicateName = fragment.getName();
+fragments.get(duplicateName).setDuplicated(true);
+// Rename the current fragment so it doesn't clash
+fragment.setName(url.toString());
}
+fragments.put(fragment.getName(), fragment);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1848676 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/descriptor/web/ webapps/docs/
Author: markt Date: Tue Dec 11 13:59:38 2018 New Revision: 1848676 URL: http://svn.apache.org/viewvc?rev=1848676&view=rev Log: Implement the requirements of section 8.2.2 2c of the Servlet specification and prevent a web application from deploying if it has fragments with duplicate names and is configured to use relative ordering of fragments. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 11 13:59:38 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1
svn commit: r1848675 - in /tomcat/trunk: java/org/apache/tomcat/util/descriptor/web/ webapps/docs/
Author: markt
Date: Tue Dec 11 13:51:41 2018
New Revision: 1848675
URL: http://svn.apache.org/viewvc?rev=1848675&view=rev
Log:
Implement the requirements of section 8.2.2 2c of the Servlet specification and
prevent a web application from deploying if it has fragments with duplicate
names and is configured to use relative ordering of fragments.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java?rev=1848675&r1=1848674&r2=1848675&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FragmentJarScannerCallback.java
Tue Dec 11 13:51:41 2018
@@ -84,7 +84,17 @@ public class FragmentJarScannerCallback
fragment.setName(fragment.getURL().toString());
}
fragment.setJarName(extractJarFileName(jar.getJarFileURL()));
-fragments.put(fragment.getName(), fragment);
+if (fragments.containsKey(fragment.getName())) {
+// Duplicate. Mark the fragment that has already been found
with
+// this name as having a duplicate so Tomcat can handle it
+// correctly when the fragments are being ordered.
+String duplicateName = fragment.getName();
+fragments.get(duplicateName).setDuplicated(true);
+// Rename the current fragment so it doesn't clash
+fragment.setName(fragment.getURL().toString());
+} else {
+fragments.put(fragment.getName(), fragment);
+}
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1848675&r1=1848674&r2=1848675&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
[UTF-8] (original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
[UTF-8] Tue Dec 11 13:51:41 2018
@@ -32,6 +32,7 @@ webRuleSet.relativeOrderingCount=http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1848675&r1=1848674&r2=1848675&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Tue Dec
11 13:51:41 2018
@@ -79,6 +79,19 @@ public class WebXml extends XmlEncodingB
this.overridable = overridable;
}
+/*
+ * Ideally, fragment names will be unique. If they are not, Tomcat needs
+ * to know as the action that the specification requires (see 8.2.2 1.e and
+ * 2.c) varies depending on the ordering method used.
+ */
+private boolean duplicated = false;
+public boolean isDuplicated() {
+return duplicated;
+}
+public void setDuplicated(boolean duplicated) {
+this.duplicated = duplicated;
+}
+
/**
* web.xml only elements
* Absolute Ordering
@@ -2237,6 +2250,13 @@ public class WebXml extends XmlEncodingB
}
}
} else {
+// Stage 0. Check there were no fragments with duplicate names
+for (WebXml fragment : fragments.values()) {
+if (fragment.isDuplicated()) {
+throw new IllegalArgumentException(
+sm.getString("webXml.duplicateFragment",
fragment.getName()));
+}
+}
// Stage 1. Make all dependencies bi-directional - this makes the
// next stage simpler.
for (WebXml fragment : fragments.values()) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1848675&r1=1848674&r2=1848675&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Dec 11 13:51:41 2018
@@ -50,6 +50,12 @@
63002: Fix setting rewrite qsdiscard flag. (remm)
+
+Implement the requirements of section 8.2.2 2c of the Se
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/3878 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] 1848670 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
Time for 8.5.36?
Chris, Are you still interested in being RM for this? 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 9.0.14
On Thu, Dec 6, 2018 at 4:37 PM Mark Thomas wrote: > The proposed Apache Tomcat 9.0.14 release is now available for voting. > > The major changes compared to the 9.0.13 release are: > > - Significant expansion of localisation support with the addition of > Brazilian Portuguese, Korean and Chinese (simplified) as well as > the expansion of coverage for existing languages > > - Refactor back ground processing and various independent thread pools > to use a common executor > > - Update the packaged version of the Tomcat Native Library to 1.2.19 to > pick up the latest Windows binaries built with APR 1.6.5 and OpenSSL > 1.1.1a. > > 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.14/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1199/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_14/ > > The proposed 9.0.14 release is: > [ ] Broken - do not release > [x] Stable - go ahead and release as 9.0.14 > +1 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Bug 63002] QSD in RewriteRule doesn't work
https://bz.apache.org/bugzilla/show_bug.cgi?id=63002 Remy Maucherat changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Remy Maucherat --- Bad cut & paste ... The fix will be in 9.0.14 and 8.5.36. -- 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: r1848671 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/rewrite/RewriteValve.java webapps/docs/changelog.xml
Author: remm Date: Tue Dec 11 11:57:43 2018 New Revision: 1848671 URL: http://svn.apache.org/viewvc?rev=1848671&view=rev Log: 63002: Fix rewrite qsdiscard flag Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 11 11:57:43 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,176
svn commit: r1848670 - in /tomcat/trunk: java/org/apache/catalina/valves/rewrite/RewriteValve.java webapps/docs/changelog.xml
Author: remm
Date: Tue Dec 11 11:49:23 2018
New Revision: 1848670
URL: http://svn.apache.org/viewvc?rev=1848670&view=rev
Log:
63002: Fix rewrite qsdiscard flag
Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1848670&r1=1848669&r2=1848670&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Tue
Dec 11 11:49:23 2018
@@ -725,7 +725,7 @@ public class RewriteValve extends ValveB
} else if (flag.startsWith("qsappend") || flag.startsWith("QSA")) {
rule.setQsappend(true);
} else if (flag.startsWith("qsdiscard") || flag.startsWith("QSD")) {
-rule.setQsappend(true);
+rule.setQsdiscard(true);
} else if (flag.startsWith("redirect") || flag.startsWith("R")) {
rule.setRedirect(true);
int redirectCode = HttpServletResponse.SC_FOUND;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1848670&r1=1848669&r2=1848670&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Dec 11 11:49:23 2018
@@ -45,6 +45,13 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+63002: Fix setting rewrite qsdiscard flag. (remm)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1848669 - in /tomcat/trunk/java/org/apache/tomcat/util: IntrospectionUtils.java LocalStrings.properties
Author: remm
Date: Tue Dec 11 11:48:54 2018
New Revision: 1848669
URL: http://svn.apache.org/viewvc?rev=1848669&view=rev
Log:
Add i18n for util package.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1848669&r1=1848668&r2=1848669&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Tue Dec 11
11:48:54 2018
@@ -25,14 +25,15 @@ import java.util.Hashtable;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/**
* Utils for introspection and reflection
*/
public final class IntrospectionUtils {
-
private static final Log log = LogFactory.getLog(IntrospectionUtils.class);
+private static final StringManager sm =
StringManager.getManager(IntrospectionUtils.class);
/**
* Find a method with the right name If found, call the method ( if param
is
@@ -165,18 +166,11 @@ public final class IntrospectionUtils {
}
}
-} catch (IllegalArgumentException ex2) {
-log.warn("IAE " + o + " " + name + " " + value, ex2);
-} catch (SecurityException ex1) {
-log.warn("IntrospectionUtils: SecurityException for " +
-o.getClass() + " " + name + "=" + value + ")", ex1);
-} catch (IllegalAccessException iae) {
-log.warn("IntrospectionUtils: IllegalAccessException for " +
-o.getClass() + " " + name + "=" + value + ")", iae);
-} catch (InvocationTargetException ie) {
-ExceptionUtils.handleThrowable(ie.getCause());
-log.warn("IntrospectionUtils: InvocationTargetException for " +
-o.getClass() + " " + name + "=" + value + ")", ie);
+} catch (IllegalArgumentException | SecurityException |
IllegalAccessException e) {
+log.warn(sm.getString("introspectionUtils.setPropertyError", name,
value, o.getClass()), e);
+} catch (InvocationTargetException e) {
+ExceptionUtils.handleThrowable(e.getCause());
+log.warn(sm.getString("introspectionUtils.setPropertyError", name,
value, o.getClass()), e);
}
return false;
}
@@ -211,22 +205,15 @@ public final class IntrospectionUtils {
return getPropertyMethod.invoke(o, params);
}
-} catch (IllegalArgumentException ex2) {
-log.warn("IAE " + o + " " + name, ex2);
-} catch (SecurityException ex1) {
-log.warn("IntrospectionUtils: SecurityException for " +
-o.getClass() + " " + name + ")", ex1);
-} catch (IllegalAccessException iae) {
-log.warn("IntrospectionUtils: IllegalAccessException for " +
-o.getClass() + " " + name + ")", iae);
-} catch (InvocationTargetException ie) {
-if (ie.getCause() instanceof NullPointerException) {
+} catch (IllegalArgumentException | SecurityException |
IllegalAccessException e) {
+log.warn(sm.getString("introspectionUtils.getPropertyError", name,
o.getClass()), e);
+} catch (InvocationTargetException e) {
+if (e.getCause() instanceof NullPointerException) {
// Assume the underlying object uses a storage to represent an
unset property
return null;
}
-ExceptionUtils.handleThrowable(ie.getCause());
-log.warn("IntrospectionUtils: InvocationTargetException for " +
-o.getClass() + " " + name + ")", ie);
+ExceptionUtils.handleThrowable(e.getCause());
+log.warn(sm.getString("introspectionUtils.getPropertyError", name,
o.getClass()), e);
}
return null;
}
@@ -350,10 +337,8 @@ public final class IntrospectionUtils {
public static Object callMethod1(Object target, String methodN,
Object param1, String typeParam1, ClassLoader cl) throws Exception
{
-if (target == null || param1 == null) {
-throw new IllegalArgumentException(
-"IntrospectionUtils: Assert: Illegal params " +
-target + " " + param1);
+if (target == null || methodN == null || param1 == null) {
+throw new
IllegalArgumentException(sm.getString("introspectionUtils.nullParameter"));
}
if (log.isDebugEnabled())
log.debug("IntrospectionUtils: callMethod1 " +
@@ -443,7 +428,7 @@ public final class IntrospectionUtils {
paramType.g
svn commit: r1848668 - /tomcat/trunk/build.xml
Author: markt Date: Tue Dec 11 11:33:35 2018 New Revision: 1848668 URL: http://svn.apache.org/viewvc?rev=1848668&view=rev Log: Additional fix for Gump failure and to address buildbot failures triggered by the first part of the Gump fix. Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1848668&r1=1848667&r2=1848668&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Dec 11 11:33:35 2018 @@ -1610,6 +1610,8 @@ + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63002] New: QSD in RewriteRule doesn't work
https://bz.apache.org/bugzilla/show_bug.cgi?id=63002 Bug ID: 63002 Summary: QSD in RewriteRule doesn't work Product: Tomcat 8 Version: 8.5.35 Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: melvind...@gmail.com Target Milestone: Hi there, QSD flag added to any RewriteRule doesn't work. RewriteRule ^/app1/(.*)$ /app1/rewrite.jsp [L,QSD] this is my only line in rewrite.config, When I give http://localhost:8080/app1/test.jsp?value=single as the request, the ideal behaviour must discard the querystring and go to rewrite.jsp. But it doesn't and I found the cause. Hope 1845673 is the revision of tomcat 8.5.35. In java/org/apache/catalina/valves/rewrite/RewriteValve.java line 785, rule is set for qsAppend instead of qsDiscard. Do the needful. Regards, Melvin A -- 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
