Author: markt
Date: Thu Nov 23 18:49:05 2017
New Revision: 1816184
URL: http://svn.apache.org/viewvc?rev=1816184&view=rev
Log:
Allow runtime updates to the current SSLHostConfigs.
Move JMX registration to the Endpoint to make it easier to keep JMX
registration in sync with runtime changes.
Protect against removing the default while running.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 23 18:49:05 2017
@@ -1,2 +1,2 @@
/tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,176
8520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,
1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,17885
54,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,17
95893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616
,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812
088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,176
8283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-
1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,17885
50,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,17
95813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459
,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808482,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811
861,1811932,1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1816184&r1=1816183&r2=1816184&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java Thu
Nov 23 18:49:05 2017
@@ -943,8 +943,7 @@ public class Connector extends Lifecycle
try {
protocolHandler.pause();
} catch (Exception e) {
- log.error(sm.getString
- ("coyoteConnector.protocolHandlerPauseFailed"), e);
+
log.error(sm.getString("coyoteConnector.protocolHandlerPauseFailed"), e);
}
}
@@ -956,8 +955,7 @@ public class Connector extends Lifecycle
try {
protocolHandler.resume();
} catch (Exception e) {
- log.error(sm.getString
- ("coyoteConnector.protocolHandlerResumeFailed"), e);
+
log.error(sm.getString("coyoteConnector.protocolHandlerResumeFailed"), e);
}
}
@@ -972,22 +970,20 @@ public class Connector extends Lifecycle
protocolHandler.setAdapter(adapter);
// Make sure parseBodyMethodsSet has a default
- if( null == parseBodyMethodsSet ) {
+ if (null == parseBodyMethodsSet) {
setParseBodyMethods(getParseBodyMethods());
}
- if (protocolHandler.isAprRequired() &&
- !AprLifecycleListener.isAprAvailable()) {
- throw new LifecycleException(
- sm.getString("coyoteConnector.protocolHandlerNoApr",
- getProtocolHandlerClassName()));
+ if (protocolHandler.isAprRequired() &&
!AprLifecycleListener.isAprAvailable()) {
+ throw new
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoApr",
+ getProtocolHandlerClassName()));
}
- if (AprLifecycleListener.isAprAvailable() &&
- AprLifecycleListener.getUseOpenSSL() &&
+ if (AprLifecycleListener.isAprAvailable() &&
AprLifecycleListener.getUseOpenSSL() &&
protocolHandler instanceof AbstractHttp11JsseProtocol) {
AbstractHttp11JsseProtocol<?> jsseProtocolHandler =
(AbstractHttp11JsseProtocol<?>) protocolHandler;
- if (jsseProtocolHandler.isSSLEnabled() &&
jsseProtocolHandler.getSslImplementationName() == null) {
+ if (jsseProtocolHandler.isSSLEnabled() &&
+ jsseProtocolHandler.getSslImplementationName() == null) {
// OpenSSL is compatible with the JSSE configuration, so use
it if APR is available
jsseProtocolHandler.setSslImplementationName(OpenSSLImplementation.class.getName());
}
@@ -1021,14 +1017,8 @@ public class Connector extends Lifecycle
try {
protocolHandler.start();
} catch (Exception e) {
- String errPrefix = "";
- if(this.service != null) {
- errPrefix += "service.getName(): \"" + this.service.getName()
+ "\"; ";
- }
-
- throw new LifecycleException
- (errPrefix + " " + sm.getString
- ("coyoteConnector.protocolHandlerStartFailed"), e);
+ throw new LifecycleException(
+
sm.getString("coyoteConnector.protocolHandlerStartFailed"), e);
}
}
@@ -1046,9 +1036,8 @@ public class Connector extends Lifecycle
try {
protocolHandler.stop();
} catch (Exception e) {
- throw new LifecycleException
- (sm.getString
- ("coyoteConnector.protocolHandlerStopFailed"), e);
+ throw new LifecycleException(
+ sm.getString("coyoteConnector.protocolHandlerStopFailed"),
e);
}
}
@@ -1058,9 +1047,8 @@ public class Connector extends Lifecycle
try {
protocolHandler.destroy();
} catch (Exception e) {
- throw new LifecycleException
- (sm.getString
- ("coyoteConnector.protocolHandlerDestroyFailed"), e);
+ throw new LifecycleException(
+
sm.getString("coyoteConnector.protocolHandlerDestroyFailed"), e);
}
if (getService() != null) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1816184&r1=1816183&r2=1816184&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Nov
23 18:49:05 2017
@@ -19,7 +19,6 @@ package org.apache.coyote;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -43,8 +42,6 @@ import org.apache.tomcat.util.collection
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler;
-import org.apache.tomcat.util.net.SSLHostConfig;
-import org.apache.tomcat.util.net.SSLHostConfigCertificate;
import org.apache.tomcat.util.net.SocketEvent;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -72,16 +69,6 @@ public abstract class AbstractProtocol<S
/**
- * Name of MBean for the ThreadPool.
- */
- protected ObjectName tpOname = null;
-
-
- private Set<ObjectName> sslOnames = new HashSet<>();
- private Set<ObjectName> sslCertOnames = new HashSet<>();
-
-
- /**
* Unique ID for this connector. Only used if the connector is configured
* to use a random port as the port will change if stop(), start() is
* called.
@@ -582,36 +569,14 @@ public abstract class AbstractProtocol<S
}
if (this.domain != null) {
- try {
- tpOname = new ObjectName(domain + ":type=ThreadPool,name=" +
getName());
- Registry.getRegistry(null, null).registerComponent(endpoint,
tpOname, null);
- } catch (Exception e) {
-
getLog().error(sm.getString("abstractProtocolHandler.mbeanRegistrationFailed",
- tpOname, getName()), e);
- }
rgOname = new ObjectName(domain +
":type=GlobalRequestProcessor,name=" + getName());
Registry.getRegistry(null, null).registerComponent(
getHandler().getGlobal(), rgOname, null);
-
- for (SSLHostConfig sslHostConfig :
getEndpoint().findSslHostConfigs()) {
- ObjectName sslOname = new ObjectName(domain +
":type=SSLHostConfig,ThreadPool=" +
- getName() + ",name=" +
ObjectName.quote(sslHostConfig.getHostName()));
- Registry.getRegistry(null,
null).registerComponent(sslHostConfig, sslOname, null);
- sslOnames.add(sslOname);
- for (SSLHostConfigCertificate sslHostConfigCert :
sslHostConfig.getCertificates()) {
- ObjectName sslCertOname = new ObjectName(domain +
- ":type=SSLHostConfigCertificate,ThreadPool=" +
getName() +
- ",Host=" +
ObjectName.quote(sslHostConfig.getHostName()) +
- ",name=" + sslHostConfigCert.getType());
- Registry.getRegistry(null, null).registerComponent(
- sslHostConfigCert, sslCertOname, null);
- sslCertOnames.add(sslCertOname);
- }
- }
}
String endpointName = getName();
endpoint.setName(endpointName.substring(1, endpointName.length()-1));
+ endpoint.setDomain(domain);
endpoint.init();
}
@@ -695,18 +660,9 @@ public abstract class AbstractProtocol<S
}
}
- if (tpOname != null) {
- Registry.getRegistry(null, null).unregisterComponent(tpOname);
- }
if (rgOname != null) {
Registry.getRegistry(null, null).unregisterComponent(rgOname);
}
- for (ObjectName sslOname : sslOnames) {
- Registry.getRegistry(null, null).unregisterComponent(sslOname);
- }
- for (ObjectName sslCertOname : sslCertOnames) {
- Registry.getRegistry(null,
null).unregisterComponent(sslCertOname);
- }
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1816184&r1=1816183&r2=1816184&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/LocalStrings.properties
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/LocalStrings.properties Thu Nov
23 18:49:05 2017
@@ -33,8 +33,6 @@ abstractProtocol.mbeanDeregistrationFail
abstractProtocolHandler.getAttribute=Get attribute [{0}] with value [{1}]
abstractProtocolHandler.setAttribute=Set attribute [{0}] with value [{1}]
abstractProtocolHandler.init=Initializing ProtocolHandler [{0}]
-abstractProtocolHandler.initError=Failed to initialize end point associated
with ProtocolHandler [{0}]
-abstractProtocolHandler.mbeanRegistrationFailed=Failed to register MBean [{0}]
for ProtocolHandler [{1}]
abstractProtocolHandler.start=Starting ProtocolHandler [{0}]
abstractProtocolHandler.startError=Failed to start end point associated with
ProtocolHandler [{0}]
abstractProtocolHandler.pause=Pausing ProtocolHandler [{0}]
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1816184&r1=1816183&r2=1816184&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Thu Nov 23 18:49:05 2017
@@ -33,10 +33,14 @@ import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.collections.SynchronizedStack;
+import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.net.AbstractEndpoint.Acceptor.AcceptorState;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.threads.LimitLatch;
@@ -190,6 +194,8 @@ public abstract class AbstractEndpoint<S
*/
protected SynchronizedStack<SocketProcessorBase<S>> processorCache;
+ private ObjectName oname = null;
+
// -----------------------------------------------------------------
Properties
private String defaultSSLHostConfigName =
SSLHostConfig.DEFAULT_SSL_HOST_NAME;
@@ -202,7 +208,33 @@ public abstract class AbstractEndpoint<S
protected ConcurrentMap<String,SSLHostConfig> sslHostConfigs = new
ConcurrentHashMap<>();
+ /**
+ * Add the given SSL Host configuration.
+ *
+ * @param sslHostConfig The configuration to add
+ *
+ * @throws IllegalArgumentException If the host name is not valid or if a
+ * configuration has already been provided
+ * for that host
+ */
public void addSslHostConfig(SSLHostConfig sslHostConfig) throws
IllegalArgumentException {
+ addSslHostConfig(sslHostConfig, false);
+ }
+ /**
+ * Add the given SSL Host configuration, optionally replacing the existing
+ * configuration for the given host.
+ *
+ * @param sslHostConfig The configuration to add
+ * @param replace If {@code true} replacement of an existing
+ * configuration is permitted, otherwise any such
+ * attempted replacement will trigger an exception
+ *
+ * @throws IllegalArgumentException If the host name is not valid or if a
+ * configuration has already been provided
+ * for that host and replacement is not
+ * allowed
+ */
+ public void addSslHostConfig(SSLHostConfig sslHostConfig, boolean replace)
throws IllegalArgumentException {
String key = sslHostConfig.getHostName();
if (key == null || key.length() == 0) {
throw new
IllegalArgumentException(sm.getString("endpoint.noSslHostName"));
@@ -215,10 +247,69 @@ public abstract class AbstractEndpoint<S
throw new IllegalArgumentException(e);
}
}
- SSLHostConfig duplicate = sslHostConfigs.putIfAbsent(key,
sslHostConfig);
- if (duplicate != null) {
- releaseSSLContext(sslHostConfig);
- throw new
IllegalArgumentException(sm.getString("endpoint.duplicateSslHostName", key));
+ if (replace) {
+ SSLHostConfig previous = sslHostConfigs.put(key, sslHostConfig);
+ if (previous != null) {
+ unregisterJmx(sslHostConfig);
+ }
+ registerJmx(sslHostConfig);
+
+ // Do not release any SSLContexts associated with a replaced
+ // SSLHostConfig. They may still be in used by existing connections
+ // and releasing them would break the connection at best. Let GC
+ // handle the clean up.
+ } else {
+ SSLHostConfig duplicate = sslHostConfigs.putIfAbsent(key,
sslHostConfig);
+ if (duplicate != null) {
+ releaseSSLContext(sslHostConfig);
+ throw new
IllegalArgumentException(sm.getString("endpoint.duplicateSslHostName", key));
+ }
+ registerJmx(sslHostConfig);
+ }
+ }
+ /**
+ * Removes the SSL host configuration for the given host name, if such a
+ * configuration exists.
+ *
+ * @param hostName The host name associated with the SSL host
configuration
+ * to remove
+ *
+ * @return The SSL host configuration that was removed, if any
+ */
+ public SSLHostConfig removeSslHostConfig(String hostName) {
+ // Host names are case insensitive
+ if (hostName != null &&
hostName.equalsIgnoreCase(getDefaultSSLHostConfigName())) {
+ throw new IllegalArgumentException(
+ sm.getString("endpoint.removeDefaultSslHostConfig",
hostName));
+ }
+ SSLHostConfig sslHostConfig = sslHostConfigs.remove(hostName);
+ unregisterJmx(sslHostConfig);
+ return sslHostConfig;
+ }
+ /**
+ * Re-read the configuration files for the SSL host and replace the
existing
+ * SSL configuration with the updated settings. Note this replacement will
+ * happen even if the settings remain unchanged.
+ *
+ * @param hostName The SSL host for which the configuration should be
+ * reloaded. This must match a current SSL host
+ */
+ public void reloadSslHostConfig(String hostName) {
+ SSLHostConfig sslHostConfig = sslHostConfigs.get(hostName);
+ if (sslHostConfig == null) {
+ throw new IllegalArgumentException(
+ sm.getString("endpoint.unknownSslHostName", hostName));
+ }
+ addSslHostConfig(sslHostConfig, true);
+ }
+ /**
+ * Re-read the configuration files for all SSL hosts and replace the
+ * existing SSL configuration with the updated settings. Note this
+ * replacement will happen even if the settings remain unchanged.
+ */
+ public void reloadSslHostConfigs() {
+ for (String hostName : sslHostConfigs.keySet()) {
+ reloadSslHostConfig(hostName);
}
}
public SSLHostConfig[] findSslHostConfigs() {
@@ -608,6 +699,15 @@ public abstract class AbstractEndpoint<S
public void setName(String name) { this.name = name; }
public String getName() { return name; }
+
+ /**
+ * Name of domain to use for JMX registration.
+ */
+ private String domain;
+ public void setDomain(String domain) { this.domain = domain; }
+ public String getDomain() { return domain; }
+
+
/**
* The default is true - the created threads will be
* in daemon mode. If set to false, the control thread
@@ -982,6 +1082,62 @@ public abstract class AbstractEndpoint<S
bind();
bindState = BindState.BOUND_ON_INIT;
}
+ if (this.domain != null) {
+ // Register endpoint (as ThreadPool - historical name)
+ oname = new ObjectName(domain + ":type=ThreadPool,name=\"" +
getName() + "\"");
+ Registry.getRegistry(null, null).registerComponent(this, oname,
null);
+
+ for (SSLHostConfig sslHostConfig : findSslHostConfigs()) {
+ registerJmx(sslHostConfig);
+ }
+ }
+ }
+
+
+ private void registerJmx(SSLHostConfig sslHostConfig) {
+ ObjectName sslOname = null;
+ try {
+ sslOname = new ObjectName(domain +
":type=SSLHostConfig,ThreadPool=" +
+ getName() + ",name=" +
ObjectName.quote(sslHostConfig.getHostName()));
+ sslHostConfig.setObjectName(sslOname);
+ try {
+ Registry.getRegistry(null,
null).registerComponent(sslHostConfig, sslOname, null);
+ } catch (Exception e) {
+ getLog().warn(sm.getString("endpoint.jmxRegistrationFailed",
sslOname), e);
+ }
+ } catch (MalformedObjectNameException e) {
+ getLog().warn(sm.getString("endpoint.invalidJmxNameSslHost",
+ sslHostConfig.getHostName()), e);
+ }
+
+ for (SSLHostConfigCertificate sslHostConfigCert :
sslHostConfig.getCertificates()) {
+ ObjectName sslCertOname = null;
+ try {
+ sslCertOname = new ObjectName(domain +
+ ":type=SSLHostConfigCertificate,ThreadPool=" +
getName() +
+ ",Host=" +
ObjectName.quote(sslHostConfig.getHostName()) +
+ ",name=" + sslHostConfigCert.getType());
+ sslHostConfigCert.setObjectName(sslCertOname);
+ try {
+ Registry.getRegistry(null, null).registerComponent(
+ sslHostConfigCert, sslCertOname, null);
+ } catch (Exception e) {
+
getLog().warn(sm.getString("endpoint.jmxRegistrationFailed", sslCertOname), e);
+ }
+ } catch (MalformedObjectNameException e) {
+
getLog().warn(sm.getString("endpoint.invalidJmxNameSslHostCert",
+ sslHostConfig.getHostName(),
sslHostConfigCert.getType()), e);
+ }
+ }
+ }
+
+
+ private void unregisterJmx(SSLHostConfig sslHostConfig) {
+ Registry registry = Registry.getRegistry(null, null);
+ registry.unregisterComponent(sslHostConfig.getObjectName());
+ for (SSLHostConfigCertificate sslHostConfigCert :
sslHostConfig.getCertificates()) {
+ registry.unregisterComponent(sslHostConfigCert.getObjectName());
+ }
}
@@ -1050,8 +1206,14 @@ public abstract class AbstractEndpoint<S
unbind();
bindState = BindState.UNBOUND;
}
+ Registry registry = Registry.getRegistry(null, null);
+ registry.unregisterComponent(oname);
+ for (SSLHostConfig sslHostConfig : findSslHostConfigs()) {
+ unregisterJmx(sslHostConfig);
+ }
}
+
protected abstract Log getLog();
protected LimitLatch initializeConnectionLatch() {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1816184&r1=1816183&r2=1816184&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
Thu Nov 23 18:49:05 2017
@@ -49,6 +49,9 @@ endpoint.getAttribute=[{0}] is [{1}]
endpoint.init.bind=Socket bind failed: [{0}] [{1}]
endpoint.init.listen=Socket listen failed: [{0}] [{1}]
endpoint.init.notavail=APR not available
+endpoint.invalidJmxNameSslHost=Unable to generate a valid JMX object name for
the SSLHostConfig associated with host [{0}]
+endpoint.invalidJmxNameSslHostCert=Unable to generate a valid JMX object name
for the SSLHostConfigCertificate associated with host [{0}] and certificate
type [{1}]
+endpoint.jmxRegistrationFailed=Failed to register the JMX object with name
[{0}]
endpoint.launch.fail=Failed to launch new runnable
endpoint.noSslHostConfig=No SSLHostConfig element was found with the hostName
[{0}] to match the defaultSSLHostConfigName for the connector [{1}]
endpoint.noSslHostName=No host name was provided for the SSL host configuration
@@ -58,10 +61,12 @@ endpoint.poll.fail=Critical poller failu
endpoint.poll.error=Unexpected poller error
endpoint.process.fail=Error allocating socket processor
endpoint.processing.fail=Error running socket processor
+endpoint.removeDefaultSslHostConfig=The default SSLHostConfig (named [{0}])
may not be removed
endpoint.sendfile.error=Unexpected sendfile error
endpoint.sendfile.addfail=Sendfile failure: [{0}] [{1}]
endpoint.setAttribute=Set [{0}] to [{1}]
endpoint.timeout.err=Error processing socket timeout
+endpoint.unknownSslHostName=The SSL host name [{0}] is not recognised for this
endpoint
endpoint.apr.failSslContextMake=Unable to create SSLContext. Check that
SSLEngine is enabled in the AprLifecycleListener, the AprLifecycleListener has
initialised correctly and that a valid SSLProtocol has been specified
endpoint.apr.invalidSslProtocol=An invalid value [{0}] was provided for the
SSLProtocol attribute
endpoint.apr.maxConnections.running=The APR endpoint does not support the
setting of maxConnections while it is running. The existing value of [{0}] will
continue to be used.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1816184&r1=1816183&r2=1816184&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Thu
Nov 23 18:49:05 2017
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.management.ObjectName;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManagerFactory;
@@ -81,6 +82,7 @@ public class SSLHostConfig implements Se
// Internal
private String[] enabledCiphers;
private String[] enabledProtocols;
+ private ObjectName oname;
// Nested
private SSLHostConfigCertificate defaultCertificate = null;
private Set<SSLHostConfigCertificate> certificates = new HashSet<>(4);
@@ -221,6 +223,16 @@ public class SSLHostConfig implements Se
}
+ public ObjectName getObjectName() {
+ return oname;
+ }
+
+
+ public void setObjectName(ObjectName oname) {
+ this.oname = oname;
+ }
+
+
// ------------------------------------------- Nested configuration
elements
private void registerDefaultCertificate() {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1816184&r1=1816183&r2=1816184&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Thu Nov 23 18:49:05 2017
@@ -22,6 +22,8 @@ import java.security.KeyStore;
import java.util.HashSet;
import java.util.Set;
+import javax.management.ObjectName;
+
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
@@ -41,6 +43,9 @@ public class SSLHostConfigCertificate im
static final String DEFAULT_KEYSTORE_TYPE =
System.getProperty("javax.net.ssl.keyStoreType", "JKS");
+ // Internal
+ private ObjectName oname;
+
// OpenSSL can handle multiple certs in a single config so the reference to
// the context is at the virtual host level. JSSE can't so the reference is
// held here on the certificate.
@@ -92,6 +97,18 @@ public class SSLHostConfigCertificate im
}
+ // Internal
+
+ public ObjectName getObjectName() {
+ return oname;
+ }
+
+
+ public void setObjectName(ObjectName oname) {
+ this.oname = oname;
+ }
+
+
// Common
public Type getType() {
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=1816184&r1=1816183&r2=1816184&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Nov 23 18:49:05 2017
@@ -149,6 +149,11 @@
connectors when using the JSSE implementation for TLS when running on
Java 9. (markt)
</add>
+ <add>
+ <bug>60762</bug>: Add the ability to make changes to the TLS
+ configuration of a connector at runtime without having to restart the
+ Connector. (markt)
+ </add>
<fix>
<bug>61568</bug>: Avoid a potential <code>SecurityException</code> when
using the NIO2 connector and a new thread is added to the pool. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
