svn commit: r1696366 - /tomcat/trunk/BUILDING.txt
Author: markt Date: Tue Aug 18 08:23:29 2015 New Revision: 1696366 URL: http://svn.apache.org/r1696366 Log: Remove reference to Ant 1.8.2 since the build requires 1.9.5 onwards. Modified: tomcat/trunk/BUILDING.txt Modified: tomcat/trunk/BUILDING.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1696366&r1=1696365&r2=1696366&view=diff == --- tomcat/trunk/BUILDING.txt (original) +++ tomcat/trunk/BUILDING.txt Tue Aug 18 08:23:29 2015 @@ -343,8 +343,7 @@ For example: It is possible to further limit such run to a number of selected test methods by adding "test.entry.methods" property. The property specifies a -comma-separated list of test case methods. (This feature requires -Apache Ant 1.8.2 or later). +comma-separated list of test case methods. For example: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696367 - /tomcat/trunk/webapps/docs/building.xml
Author: markt Date: Tue Aug 18 08:24:00 2015 New Revision: 1696367 URL: http://svn.apache.org/r1696367 Log: Correct minimum version Modified: tomcat/trunk/webapps/docs/building.xml Modified: tomcat/trunk/webapps/docs/building.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1696367&r1=1696366&r2=1696367&view=diff == --- tomcat/trunk/webapps/docs/building.xml (original) +++ tomcat/trunk/webapps/docs/building.xml Tue Aug 18 08:24:00 2015 @@ -59,10 +59,10 @@ directory into which you installed the J - + -Download a binary distribution of Ant 1.9.3 or later from +Download a binary distribution of Ant 1.9.5 or later from http://ant.apache.org/bindownload.cgi";>here. @@ -230,7 +230,7 @@ Variables to add two new Classp TOMCAT_LIBS_BASEThe same location as the base.path setting in build.properties, where the binary dependencies have been downloaded - ANT_HOMEthe base path of Ant 1.9.3 or later + ANT_HOMEthe base path of Ant 1.9.5 or later - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696368 - /tomcat/trunk/webapps/docs/config/filter.xml
Author: markt Date: Tue Aug 18 08:25:04 2015 New Revision: 1696368 URL: http://svn.apache.org/r1696368 Log: Fix typo Modified: tomcat/trunk/webapps/docs/config/filter.xml Modified: tomcat/trunk/webapps/docs/config/filter.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1696368&r1=1696367&r2=1696368&view=diff == --- tomcat/trunk/webapps/docs/config/filter.xml (original) +++ tomcat/trunk/webapps/docs/config/filter.xml Tue Aug 18 08:25:04 2015 @@ -752,7 +752,7 @@ FINE: Request "/docs/config/manager.html -What value should be used for the ant click-jacking header? Must be +What value should be used for the anticlick-jacking header? Must be one of DENY, SAMEORIGIN, ALLOW-FROM (case-insensitive). If not specified, the default value of DENY will be used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696369 - in /tomcat/tc8.0.x/trunk: ./ BUILDING.txt
Author: markt Date: Tue Aug 18 08:39:15 2015 New Revision: 1696369 URL: http://svn.apache.org/r1696369 Log: Remove reference to Ant 1.8.2 since the build requires 1.9.5 onwards. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/BUILDING.txt Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 18 08:39:15 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582 6,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695459,1695582,1695706,1695778,1696199,1696272,1696280 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/143 Buildbot URL: http://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] 1696368 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696370 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/building.xml
Author: markt Date: Tue Aug 18 08:42:28 2015 New Revision: 1696370 URL: http://svn.apache.org/r1696370 Log: Correct minimum version Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/building.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 18 08:42:28 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582 6,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,
svn commit: r1696371 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/config/filter.xml
Author: markt Date: Tue Aug 18 08:43:10 2015 New Revision: 1696371 URL: http://svn.apache.org/r1696371 Log: Fix typo Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/config/filter.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 18 08:43:10 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582 6,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696367 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,16
buildbot exception in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a build exception on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/68 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1696371 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696373 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Author: markt
Date: Tue Aug 18 09:04:42 2015
New Revision: 1696373
URL: http://svn.apache.org/r1696373
Log:
Still not seeing the log info we need. Try a different approach.
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1696373&r1=1696372&r2=1696373&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Tue Aug
18 09:04:42 2015
@@ -118,12 +118,17 @@ public class TestHttp2Section_5_3 extend
parser.readFrame(true);
// Debugging Gump failure
System.err.println(output.getTrace());
-// Temp try block to help gump log
-try {
-parser.readFrame(true);
-} catch (Throwable t) {
-Assert.fail(t.getMessage());
+
+// This frame is not always written
+int count = 0;
+while (!parser.readFrame(false) && count < 10) {
+Thread.sleep(100);
+count++;
+}
+if (count == 10) {
+Assert.fail("Second 1 byte body frame not received");
}
+
// Debugging Gump failure
System.err.println(output.getTrace());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/144 Buildbot URL: http://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] 1696373 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696376 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Author: markt
Date: Tue Aug 18 09:22:08 2015
New Revision: 1696376
URL: http://svn.apache.org/r1696376
Log:
Switch extra debug output to stdout. Using stderr looks like it could be
interferring with the normal logging.
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1696376&r1=1696375&r2=1696376&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Tue Aug
18 09:22:08 2015
@@ -66,7 +66,7 @@ public class TestHttp2Section_5_3 extend
// Wait for the ack
parser.readFrame(true);
// Debugging Gump failure
-System.err.println(output.getTrace());
+System.out.println(output.getTrace());
output.clearTrace();
// At this point the connection window should be 1k and any new stream
@@ -83,10 +83,10 @@ public class TestHttp2Section_5_3 extend
// 17-headers, 17-1k-body
parser.readFrame(true);
// Debugging Gump failure
-System.err.println(output.getTrace());
+System.out.println(output.getTrace());
parser.readFrame(true);
// Debugging Gump failure
-System.err.println(output.getTrace());
+System.out.println(output.getTrace());
output.clearTrace();
// Send additional requests. Connection window is empty so only headers
@@ -103,10 +103,10 @@ public class TestHttp2Section_5_3 extend
// 19-headers, 21-headers
parser.readFrame(true);
// Debugging Gump failure
-System.err.println(output.getTrace());
+System.out.println(output.getTrace());
parser.readFrame(true);
// Debugging Gump failure
-System.err.println(output.getTrace());
+System.out.println(output.getTrace());
output.clearTrace();
// At this point 17 is blocked because the stream window is zero and
@@ -117,7 +117,7 @@ public class TestHttp2Section_5_3 extend
sendWindowUpdate(0, 1);
parser.readFrame(true);
// Debugging Gump failure
-System.err.println(output.getTrace());
+System.out.println(output.getTrace());
// This frame is not always written
int count = 0;
@@ -130,7 +130,7 @@ public class TestHttp2Section_5_3 extend
}
// Debugging Gump failure
-System.err.println(output.getTrace());
+System.out.println(output.getTrace());
String trace = output.getTrace();
Assert.assertTrue(trace, trace.contains("19-Body-1"));
@@ -144,10 +144,10 @@ public class TestHttp2Section_5_3 extend
sendWindowUpdate(0, 1024);
parser.readFrame(true);
// Debugging Gump failure
-System.err.println(output.getTrace());
+System.out.println(output.getTrace());
parser.readFrame(true);
// Debugging Gump failure
-System.err.println(output.getTrace());
+System.out.println(output.getTrace());
trace = output.getTrace();
Assert.assertTrue(trace, trace.contains("19-Body-256"));
@@ -162,7 +162,7 @@ public class TestHttp2Section_5_3 extend
for (int i = 0; i < 3; i++) {
parser.readFrame(true);
// Debugging Gump failure
-System.err.println(output.getTrace());
+System.out.println(output.getTrace());
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58255] New: Semaphore valve document is not existent
https://bz.apache.org/bugzilla/show_bug.cgi?id=58255 Bug ID: 58255 Summary: Semaphore valve document is not existent Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: nakamura.kyohei@gmail.com Created attachment 33007 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33007&action=edit patch against trunk. The Semaphore Valve does not exist in the Valve configuration document. Therefore, I created a document. -- 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: r1696378 - /tomcat/trunk/webapps/docs/config/valve.xml
Author: markt Date: Tue Aug 18 09:36:47 2015 New Revision: 1696378 URL: http://svn.apache.org/r1696378 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58255 Document the Semaphore valve. Patch provided by Kyohei Nakamura. Modified: tomcat/trunk/webapps/docs/config/valve.xml Modified: tomcat/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1696378&r1=1696377&r2=1696378&view=diff == --- tomcat/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/trunk/webapps/docs/config/valve.xml Tue Aug 18 09:36:47 2015 @@ -1729,6 +1729,61 @@ + + + + +The Semaphore Valve is able to limit the number of +concurrent request processing threads. +org.apache.catalina.valves.SemaphoreValve provides +methods which may be overridden by a subclass to customize behavior: + +controlConcurrency may be overridden to add +conditions; +permitDenied may be overridden to add error handling +when a permit isn't granted. + + + + + + +The Semaphore Valve supports the following +configuration attributes: + + + + +Flag to determine if a thread is blocked until a permit is available. +The default value is true. + + + +Java class name of the implementation to use. This MUST be set to +org.apache.catalina.valves.SemaphoreValve. + + + +Concurrency level of the semaphore. The default value is +10. + + + +Fairness of the semaphore. The default value is +false. + + + +Flag to determine if a thread may be interrupted until a permit is +available. The default value is false. + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696379 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/valve.xml
Author: markt Date: Tue Aug 18 09:39:20 2015 New Revision: 1696379 URL: http://svn.apache.org/r1696379 Log: Document the Semaphore valve. Patch provided by Kyohei Nakamura. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 18 09:39:20 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582 6,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695459,1695582,1695706,1695778,1696199,1696272,1696280,169636
svn commit: r1696381 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/valve.xml
Author: markt Date: Tue Aug 18 09:43:02 2015 New Revision: 1696381 URL: http://svn.apache.org/r1696381 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58255 Document the Semaphore valve. Patch provided by Kyohei Nakamura. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 18 09:43:02 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,13484
svn commit: r1696382 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/valve.xml
Author: markt Date: Tue Aug 18 09:44:22 2015 New Revision: 1696382 URL: http://svn.apache.org/r1696382 Log: CTR (docs) Document the Semaphore valve. Patch provided by Kyohei Nakamura. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 18 09:44:22 2015 @@ -1,3 +1,3 @@ -/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541 ,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293 -/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1693108,1694291 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770 809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265 ,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,948057,95 0164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830
[Bug 58255] Semaphore valve document is not existent
https://bz.apache.org/bugzilla/show_bug.cgi?id=58255 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Thanks for the report and the patch. The patch has been applied (with some minor changes) to trunk, 8.0.x (for 8.0.26 onwards), 7.0.x (for 7.0.64 onwards) and 6.0.x (for 6.0.45 onwards). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696383 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Author: markt
Date: Tue Aug 18 09:50:48 2015
New Revision: 1696383
URL: http://svn.apache.org/r1696383
Log:
OK. Use the proper logging system for the temporary messages.
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1696383&r1=1696382&r2=1696383&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Tue Aug
18 09:50:48 2015
@@ -16,6 +16,8 @@
*/
package org.apache.coyote.http2;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.junit.Assert;
import org.junit.Test;
@@ -31,6 +33,8 @@ import org.junit.Test;
*/
public class TestHttp2Section_5_3 extends Http2TestBase {
+Log log = LogFactory.getLog(TestHttp2Section_5_3.class);
+
// Section 5.3.1
@Test
@@ -66,7 +70,7 @@ public class TestHttp2Section_5_3 extend
// Wait for the ack
parser.readFrame(true);
// Debugging Gump failure
-System.out.println(output.getTrace());
+log.info(output.getTrace());
output.clearTrace();
// At this point the connection window should be 1k and any new stream
@@ -83,10 +87,10 @@ public class TestHttp2Section_5_3 extend
// 17-headers, 17-1k-body
parser.readFrame(true);
// Debugging Gump failure
-System.out.println(output.getTrace());
+log.info(output.getTrace());
parser.readFrame(true);
// Debugging Gump failure
-System.out.println(output.getTrace());
+log.info(output.getTrace());
output.clearTrace();
// Send additional requests. Connection window is empty so only headers
@@ -103,10 +107,10 @@ public class TestHttp2Section_5_3 extend
// 19-headers, 21-headers
parser.readFrame(true);
// Debugging Gump failure
-System.out.println(output.getTrace());
+log.info(output.getTrace());
parser.readFrame(true);
// Debugging Gump failure
-System.out.println(output.getTrace());
+log.info(output.getTrace());
output.clearTrace();
// At this point 17 is blocked because the stream window is zero and
@@ -117,7 +121,7 @@ public class TestHttp2Section_5_3 extend
sendWindowUpdate(0, 1);
parser.readFrame(true);
// Debugging Gump failure
-System.out.println(output.getTrace());
+log.info(output.getTrace());
// This frame is not always written
int count = 0;
@@ -130,7 +134,7 @@ public class TestHttp2Section_5_3 extend
}
// Debugging Gump failure
-System.out.println(output.getTrace());
+log.info(output.getTrace());
String trace = output.getTrace();
Assert.assertTrue(trace, trace.contains("19-Body-1"));
@@ -144,10 +148,10 @@ public class TestHttp2Section_5_3 extend
sendWindowUpdate(0, 1024);
parser.readFrame(true);
// Debugging Gump failure
-System.out.println(output.getTrace());
+log.info(output.getTrace());
parser.readFrame(true);
// Debugging Gump failure
-System.out.println(output.getTrace());
+log.info(output.getTrace());
trace = output.getTrace();
Assert.assertTrue(trace, trace.contains("19-Body-256"));
@@ -162,7 +166,7 @@ public class TestHttp2Section_5_3 extend
for (int i = 0; i < 3; i++) {
parser.readFrame(true);
// Debugging Gump failure
-System.out.println(output.getTrace());
+log.info(output.getTrace());
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696386 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Author: markt
Date: Tue Aug 18 10:38:55 2015
New Revision: 1696386
URL: http://svn.apache.org/r1696386
Log:
Another attempt to get logging working for the failing test.
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1696386&r1=1696385&r2=1696386&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Tue Aug
18 10:38:55 2015
@@ -37,7 +37,8 @@ public class TestHttp2Section_5_3 extend
// Section 5.3.1
-@Test
+//@Test Disable as other test is failing and logging only works for first
+// test
public void testStreamDependsOnSelf() throws Exception {
http2Connect();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/148 Buildbot URL: http://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] 1696386 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696390 - /tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
Author: markt
Date: Tue Aug 18 10:48:27 2015
New Revision: 1696390
URL: http://svn.apache.org/r1696390
Log:
Try and make logging available for all tests in a class, not just the first.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java?rev=1696390&r1=1696389&r2=1696390&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java Tue Aug
18 10:48:27 2015
@@ -27,7 +27,9 @@ import java.util.logging.LogManager;
import static org.junit.Assert.fail;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.TestName;
@@ -99,6 +101,16 @@ public abstract class LoggingBaseTest {
deleteOnTearDown.add(file);
}
+@BeforeClass
+public void setUpPerTestClass() throws Exception {
+// Configure logging
+System.setProperty("java.util.logging.manager",
+"org.apache.juli.ClassLoaderLogManager");
+System.setProperty("java.util.logging.config.file", new File(
+getBuildDirectory(), "conf/logging.properties").toString());
+
+}
+
@Before
public void setUp() throws Exception {
// Create catalina.base directory
@@ -111,13 +123,6 @@ public abstract class LoggingBaseTest {
System.setProperty("catalina.base", tempDir.getAbsolutePath());
-// Configure logging
-System.setProperty("java.util.logging.manager",
-"org.apache.juli.ClassLoaderLogManager");
-System.setProperty("java.util.logging.config.file", new File(
-getBuildDirectory(), "conf/logging.properties").toString());
-
-// Get log instance after logging has been configured
log = LogFactory.getLog(getClass());
log.info("Starting test case [" + testName.getMethodName() + "]");
}
@@ -129,12 +134,16 @@ public abstract class LoggingBaseTest {
}
deleteOnTearDown.clear();
+ExpandWar.deleteDir(tempDir);
+}
+
+@AfterClass
+public void tearDownPerTestClass() throws Exception {
LogManager logManager = LogManager.getLogManager();
if (logManager instanceof ClassLoaderLogManager) {
((ClassLoaderLogManager) logManager).shutdown();
} else {
logManager.reset();
}
-ExpandWar.deleteDir(tempDir);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/149 Buildbot URL: http://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] 1696390 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696392 - /tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
Author: markt
Date: Tue Aug 18 11:00:24 2015
New Revision: 1696392
URL: http://svn.apache.org/r1696392
Log:
Junit requires that these methods are static
Modified:
tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java?rev=1696392&r1=1696391&r2=1696392&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java Tue Aug
18 11:00:24 2015
@@ -69,7 +69,7 @@ public abstract class LoggingBaseTest {
* is used to access resources that are part of default Tomcat deployment.
* E.g. the examples webapp.
*/
-public File getBuildDirectory() {
+public static File getBuildDirectory() {
return new File(System.getProperty("tomcat.test.tomcatbuild",
"output/build"));
}
@@ -102,7 +102,7 @@ public abstract class LoggingBaseTest {
}
@BeforeClass
-public void setUpPerTestClass() throws Exception {
+public static void setUpPerTestClass() throws Exception {
// Configure logging
System.setProperty("java.util.logging.manager",
"org.apache.juli.ClassLoaderLogManager");
@@ -138,7 +138,7 @@ public abstract class LoggingBaseTest {
}
@AfterClass
-public void tearDownPerTestClass() throws Exception {
+public static void tearDownPerTestClass() throws Exception {
LogManager logManager = LogManager.getLogManager();
if (logManager instanceof ClassLoaderLogManager) {
((ClassLoaderLogManager) logManager).shutdown();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1696390 - /tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
2015-08-18 13:48 GMT+03:00 :
> Author: markt
> Date: Tue Aug 18 10:48:27 2015
> New Revision: 1696390
>
> URL: http://svn.apache.org/r1696390
> Log:
> Try and make logging available for all tests in a class, not just the first.
>
> Modified:
> tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
>
> Modified: tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java?rev=1696390&r1=1696389&r2=1696390&view=diff
> ==
> --- tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
> (original)
> +++ tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java Tue
> Aug 18 10:48:27 2015
> @@ -27,7 +27,9 @@ import java.util.logging.LogManager;
> import static org.junit.Assert.fail;
>
> import org.junit.After;
> +import org.junit.AfterClass;
> import org.junit.Before;
> +import org.junit.BeforeClass;
> import org.junit.Rule;
> import org.junit.rules.TestName;
>
> @@ -99,6 +101,16 @@ public abstract class LoggingBaseTest {
> deleteOnTearDown.add(file);
> }
>
> +@BeforeClass
> +public void setUpPerTestClass() throws Exception {
Shouldn't this method be "static", as it is run one per class (instead
of one per test instance, each test = a separate instance of test
class)?
The same for @AfterClass one.
> +// Configure logging
> +System.setProperty("java.util.logging.manager",
> +"org.apache.juli.ClassLoaderLogManager");
> +System.setProperty("java.util.logging.config.file", new File(
> +getBuildDirectory(), "conf/logging.properties").toString());
> +
> +}
> +
> @Before
> public void setUp() throws Exception {
> // Create catalina.base directory
> @@ -111,13 +123,6 @@ public abstract class LoggingBaseTest {
>
> System.setProperty("catalina.base", tempDir.getAbsolutePath());
>
> -// Configure logging
> -System.setProperty("java.util.logging.manager",
> -"org.apache.juli.ClassLoaderLogManager");
> -System.setProperty("java.util.logging.config.file", new File(
> -getBuildDirectory(), "conf/logging.properties").toString());
> -
> -// Get log instance after logging has been configured
> log = LogFactory.getLog(getClass());
> log.info("Starting test case [" + testName.getMethodName() + "]");
> }
> @@ -129,12 +134,16 @@ public abstract class LoggingBaseTest {
> }
> deleteOnTearDown.clear();
>
> +ExpandWar.deleteDir(tempDir);
> +}
> +
> +@AfterClass
> +public void tearDownPerTestClass() throws Exception {
> LogManager logManager = LogManager.getLogManager();
> if (logManager instanceof ClassLoaderLogManager) {
> ((ClassLoaderLogManager) logManager).shutdown();
> } else {
> logManager.reset();
> }
> -ExpandWar.deleteDir(tempDir);
> }
> }
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[CANCELLED][VOTE] Release Apache Tomcat 8.0.25
On 17/08/2015 22:11, Mark Thomas wrote: > On 17/08/2015 22:09, Christopher Schultz wrote: >> Mark, >> >> On 8/17/15 4:54 PM, Mark Thomas wrote: >>> On 17/08/2015 21:10, Christopher Schultz wrote: Mark, On 8/17/15 1:46 PM, Mark Thomas wrote: > The proposed Apache Tomcat 8.0.25 release is now available for voting. > > The main changes since 8.0.24 are: > > - Fix EOF handling in the AJP APR/native connector to avoid the tight > loop that caused high CPU load > > - Avoid an NPE when adding POJO WEebSocket endpoints programmatically > > - Improved handling of async timeouts > > > There is the usual collection of bug fixes, new features and > performance improvements. For full details, see the changelog: > http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.25/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1048/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_25/ > > The proposed 8.0.24 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 8.0.25 The standard build is broken: >>> >>> >>> >>> I must have used Notepad rather than Notepad2 to edit changelog.xml to >>> create the tag without the 'in development' release text and it added >>> the BOM. I'm cancelling the vote due to the above error and will be tagging 8.0.26 shortly. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/150 Buildbot URL: http://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] 1696392 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696394 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Author: markt
Date: Tue Aug 18 11:20:13 2015
New Revision: 1696394
URL: http://svn.apache.org/r1696394
Log:
Re-enable this test now logging works for all tests in a class.
Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1696394&r1=1696393&r2=1696394&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Tue Aug
18 11:20:13 2015
@@ -37,8 +37,7 @@ public class TestHttp2Section_5_3 extend
// Section 5.3.1
-//@Test Disable as other test is failing and logging only works for first
-// test
+@Test
public void testStreamDependsOnSelf() throws Exception {
http2Connect();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696398 - /tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Author: markt
Date: Tue Aug 18 11:23:34 2015
New Revision: 1696398
URL: http://svn.apache.org/r1696398
Log:
Trivial Javadoc commit to trigger a CI build
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?rev=1696398&r1=1696397&r2=1696398&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Tue Aug 18 11:23:34 2015
@@ -42,6 +42,8 @@ public class CompressionServletResponseW
/**
* Calls the parent constructor which creates a ServletResponse adaptor
* wrapping the given response object.
+ *
+ * @param response The response object to be wrapped.
*/
public CompressionServletResponseWrapper(HttpServletResponse response) {
super(response);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696399 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Aug 18 11:27:27 2015 New Revision: 1696399 URL: http://svn.apache.org/r1696399 Log: The 8.0.25 release was cancelled due to an error made creating the tag. Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1696399&r1=1696398&r2=1696399&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Aug 18 11:27:27 2015 @@ -54,7 +54,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/151 Buildbot URL: http://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] 1696398 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696400 - in /tomcat/tc8.0.x/tags/TOMCAT_8_0_26: ./ build.properties.default webapps/docs/changelog.xml
Author: markt Date: Tue Aug 18 11:29:24 2015 New Revision: 1696400 URL: http://svn.apache.org/r1696400 Log: Tag 8.0.26 Added: tomcat/tc8.0.x/tags/TOMCAT_8_0_26/ (props changed) - copied from r1696399, tomcat/tc8.0.x/trunk/ Modified: tomcat/tc8.0.x/tags/TOMCAT_8_0_26/build.properties.default tomcat/tc8.0.x/tags/TOMCAT_8_0_26/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_26/ -- bugtraq:append = false Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_26/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_26/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Aug 18 11:29:24 2015 @@ -0,0 +1,2 @@ +(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_26/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_26/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_26/ -- --- svn:ignore (added) +++ svn:ignore Tue Aug 18 11:29:24 2015 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_26/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Aug 18 11:29:24 2015 @@ -0,0 +1 @@ +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,16
svn commit: r1696401 - /tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Author: markt
Date: Tue Aug 18 11:30:30 2015
New Revision: 1696401
URL: http://svn.apache.org/r1696401
Log:
Trivial Javadoc commit to trigger a CI build
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?rev=1696401&r1=1696400&r2=1696401&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Tue Aug 18 11:30:30 2015
@@ -104,7 +104,9 @@ public class CompressionServletResponseW
/**
- * Set threshold number
+ * Set threshold number.
+ *
+ * @param threshold The new compression threshold
*/
public void setCompressionThreshold(int threshold) {
if (debug > 1) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696403 - in /tomcat/trunk/webapps/examples/WEB-INF/classes: compressionFilters/CompressionServletResponseWrapper.java websocket/drawboard/Client.java websocket/drawboard/DrawMessage.java
Author: markt
Date: Tue Aug 18 11:41:46 2015
New Revision: 1696403
URL: http://svn.apache.org/r1696403
Log:
Trivial Javadoc commit to trigger a CI build
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?rev=1696403&r1=1696402&r2=1696403&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Tue Aug 18 11:41:46 2015
@@ -116,7 +116,9 @@ public class CompressionServletResponseW
}
/**
- * Set compression buffer
+ * Set compression buffer.
+ *
+ * @param buffer New size of buffer to use for compressed output
*/
public void setCompressionBuffer(int buffer) {
if (debug > 1) {
@@ -126,7 +128,10 @@ public class CompressionServletResponseW
}
/**
- * Set compressible mime types
+ * Set compressible mime types.
+ *
+ * @param mimeTypes The new list of mime types that will be considered for
+ * compression
*/
public void setCompressionMimeTypes(String[] mimeTypes) {
if (debug > 1) {
@@ -137,7 +142,9 @@ public class CompressionServletResponseW
}
/**
- * Set debug level
+ * Set debug level.
+ *
+ * @param debug The new debug level
*/
public void setDebugLevel(int debug) {
this.debug = debug;
@@ -149,8 +156,11 @@ public class CompressionServletResponseW
* associated with this Response.
*
* @exception IOException if an input/output error occurs
+ *
+ * @return A new servlet output stream that compressed any data written to
+ * it
*/
-public ServletOutputStream createOutputStream() throws IOException {
+protected ServletOutputStream createOutputStream() throws IOException {
if (debug > 1) {
System.out.println("createOutputStream gets called");
}
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java?rev=1696403&r1=1696402&r2=1696403&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java
Tue Aug 18 11:41:46 2015
@@ -80,7 +80,8 @@ public class Client {
* will be buffered and sent when possible.
*
* This method can be called from multiple threads.
- * @param msg
+ *
+ * @param msg The message to send
*/
public void sendMessage(AbstractWebsocketMessage msg) {
synchronized (messagesToSend) {
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java?rev=1696403&r1=1696402&r2=1696403&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
Tue Aug 18 11:41:46 2015
@@ -40,11 +40,9 @@ public final class DrawMessage {
private boolean lastInChain;
/**
- * The type.
- * 1: Brush
- * 2: Line
- * 3: Rectangle
- * 4: Ellipse
+ * The type.
+ *
+ * @return 1: Brush2: Line3: Rectangle4: Ellipse
*/
public int getType() {
return type;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696404 - /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
Author: markt
Date: Tue Aug 18 11:44:43 2015
New Revision: 1696404
URL: http://svn.apache.org/r1696404
Log:
Remove unused code
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java?rev=1696404&r1=1696403&r2=1696404&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
Tue Aug 18 11:44:43 2015
@@ -37,7 +37,6 @@ public final class DrawMessage {
private byte colorR, colorG, colorB, colorA;
private double thickness;
private double x1, y1, x2, y2;
-private boolean lastInChain;
/**
* The type.
@@ -108,23 +107,10 @@ public final class DrawMessage {
this.y2 = y2;
}
-/**
- * Specifies if this DrawMessage is the last one in a chain
- * (e.g. a chain of brush paths).
- * Currently it is unused.
- */
-public boolean isLastInChain() {
-return lastInChain;
-}
-public void setLastInChain(boolean lastInChain) {
-this.lastInChain = lastInChain;
-}
-
-
public DrawMessage(int type, byte colorR, byte colorG, byte colorB,
byte colorA, double thickness, double x1, double x2, double y1,
-double y2, boolean lastInChain) {
+double y2) {
this.type = type;
this.colorR = colorR;
@@ -136,7 +122,6 @@ public final class DrawMessage {
this.x2 = x2;
this.y1 = y1;
this.y2 = y2;
-this.lastInChain = lastInChain;
}
@@ -203,8 +188,7 @@ public final class DrawMessage {
return type + "," + (colorR & 0xFF) + "," + (colorG & 0xFF) + ","
+ (colorB & 0xFF) + "," + (colorA & 0xFF) + "," + thickness
-+ "," + x1 + "," + y1 + "," + x2 + "," + y2 + ","
-+ (lastInChain ? "1" : "0");
++ "," + x1 + "," + y1 + "," + x2 + "," + y2;
}
public static DrawMessage parseFromString(String str)
@@ -214,7 +198,6 @@ public final class DrawMessage {
byte[] colors = new byte[4];
double thickness;
double[] coords = new double[4];
-boolean last;
try {
String[] elements = str.split(",");
@@ -238,15 +221,13 @@ public final class DrawMessage {
+ coords[i]);
}
-last = !"0".equals(elements[10]);
-
} catch (RuntimeException ex) {
throw new ParseException(ex);
}
DrawMessage m = new DrawMessage(type, colors[0], colors[1],
colors[2], colors[3], thickness, coords[0], coords[2],
-coords[1], coords[3], last);
+coords[1], coords[3]);
return m;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696405 - /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
Author: markt
Date: Tue Aug 18 11:45:26 2015
New Revision: 1696405
URL: http://svn.apache.org/r1696405
Log:
Trivial Javadoc commit to trigger a CI build
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java?rev=1696405&r1=1696404&r2=1696405&view=diff
==
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
Tue Aug 18 11:45:26 2015
@@ -127,7 +127,8 @@ public final class DrawMessage {
/**
* Draws this DrawMessage onto the given Graphics2D.
- * @param g
+ *
+ * @param g The target for the DrawMessage
*/
public void draw(Graphics2D g) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1696404 - /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
2015-08-18 14:44 GMT+03:00 :
> Author: markt
> Date: Tue Aug 18 11:44:43 2015
> New Revision: 1696404
>
> URL: http://svn.apache.org/r1696404
> Log:
> Remove unused code
>
> Modified:
>
> tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
>
> Modified:
> tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java?rev=1696404&r1=1696403&r2=1696404&view=diff
> ==
> ---
> tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
> (original)
> +++
> tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
> Tue Aug 18 11:44:43 2015
> @@ -37,7 +37,6 @@ public final class DrawMessage {
> private byte colorR, colorG, colorB, colorA;
> private double thickness;
> private double x1, y1, x2, y2;
> -private boolean lastInChain;
>
> /**
> * The type.
> @@ -108,23 +107,10 @@ public final class DrawMessage {
> this.y2 = y2;
> }
>
> -/**
> - * Specifies if this DrawMessage is the last one in a chain
> - * (e.g. a chain of brush paths).
> - * Currently it is unused.
> - */
> -public boolean isLastInChain() {
> -return lastInChain;
> -}
> -public void setLastInChain(boolean lastInChain) {
> -this.lastInChain = lastInChain;
> -}
> -
> -
>
> public DrawMessage(int type, byte colorR, byte colorG, byte colorB,
> byte colorA, double thickness, double x1, double x2, double y1,
> -double y2, boolean lastInChain) {
> +double y2) {
>
> this.type = type;
> this.colorR = colorR;
> @@ -136,7 +122,6 @@ public final class DrawMessage {
> this.x2 = x2;
> this.y1 = y1;
> this.y2 = y2;
> -this.lastInChain = lastInChain;
> }
>
>
> @@ -203,8 +188,7 @@ public final class DrawMessage {
>
> return type + "," + (colorR & 0xFF) + "," + (colorG & 0xFF) + ","
> + (colorB & 0xFF) + "," + (colorA & 0xFF) + "," + thickness
> -+ "," + x1 + "," + y1 + "," + x2 + "," + y2 + ","
> -+ (lastInChain ? "1" : "0");
> ++ "," + x1 + "," + y1 + "," + x2 + "," + y2;
> }
>
> public static DrawMessage parseFromString(String str)
> @@ -214,7 +198,6 @@ public final class DrawMessage {
> byte[] colors = new byte[4];
> double thickness;
> double[] coords = new double[4];
> -boolean last;
>
> try {
> String[] elements = str.split(",");
> @@ -238,15 +221,13 @@ public final class DrawMessage {
> + coords[i]);
> }
>
> -last = !"0".equals(elements[10]);
> -
I think the above condition can have either value. It is not always
false. As such, I think removing the "last" flag below is wrong.
You can remove getter/setter in DrawMessage, but DrawMessage
constructor argument (as passed below) is used.
The value of that property is used (directly, without calling a
getter) in the following fragment above:
>> -+ "," + x1 + "," + y1 + "," + x2 + "," + y2 + ","
>> -+ (lastInChain ? "1" : "0");
>> ++ "," + x1 + "," + y1 + "," + x2 + "," + y2;
> } catch (RuntimeException ex) {
> throw new ParseException(ex);
> }
>
> DrawMessage m = new DrawMessage(type, colors[0], colors[1],
> colors[2], colors[3], thickness, coords[0], coords[2],
> -coords[1], coords[3], last);
> +coords[1], coords[3]);
>
> return m;
> }
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/153 Buildbot URL: http://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] 1696405 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696406 - /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Author: markt
Date: Tue Aug 18 12:07:54 2015
New Revision: 1696406
URL: http://svn.apache.org/r1696406
Log:
Trivial Javadoc commit to trigger a CI build
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java?rev=1696406&r1=1696405&r2=1696406&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Tue Aug 18 12:07:54 2015
@@ -166,7 +166,10 @@ public final class Room {
/**
* Creates a Player from the given Client and adds it to this room.
+ *
* @param client the client
+ *
+ * @return The newly created player
*/
public Player createAndAddPlayer(Client client) {
if (players.size() >= MAX_PLAYER_COUNT) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r10206 [1/2] - in /dev/tomcat/tomcat-8: v8.0.25/ v8.0.26/ v8.0.26/bin/ v8.0.26/bin/embed/ v8.0.26/bin/extras/ v8.0.26/src/
Author: markt Date: Tue Aug 18 12:11:44 2015 New Revision: 10206 Log: Drop 8.0.25 Upload 8.0.26 for testing Added: dev/tomcat/tomcat-8/v8.0.26/ dev/tomcat/tomcat-8/v8.0.26/KEYS (with props) dev/tomcat/tomcat-8/v8.0.26/README.html (with props) dev/tomcat/tomcat-8/v8.0.26/RELEASE-NOTES dev/tomcat/tomcat-8/v8.0.26/bin/ dev/tomcat/tomcat-8/v8.0.26/bin/README.html (with props) dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-deployer.tar.gz (with props) dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-deployer.tar.gz.asc dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-deployer.tar.gz.md5 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-deployer.tar.gz.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-deployer.zip (with props) dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-deployer.zip.asc dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-deployer.zip.md5 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-deployer.zip.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-fulldocs.tar.gz (with props) dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-fulldocs.tar.gz.asc dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-fulldocs.tar.gz.md5 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-fulldocs.tar.gz.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-i64.zip (with props) dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-i64.zip.asc dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-i64.zip.md5 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-i64.zip.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-x64.zip (with props) dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-x64.zip.asc dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-x64.zip.md5 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-x64.zip.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-x86.zip (with props) dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-x86.zip.asc dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-x86.zip.md5 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26-windows-x86.zip.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.exe (with props) dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.exe.asc dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.exe.md5 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.exe.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.tar.gz (with props) dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.tar.gz.asc dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.tar.gz.md5 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.tar.gz.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.zip (with props) dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.zip.asc dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.zip.md5 dev/tomcat/tomcat-8/v8.0.26/bin/apache-tomcat-8.0.26.zip.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/embed/ dev/tomcat/tomcat-8/v8.0.26/bin/embed/apache-tomcat-8.0.26-embed.tar.gz (with props) dev/tomcat/tomcat-8/v8.0.26/bin/embed/apache-tomcat-8.0.26-embed.tar.gz.asc dev/tomcat/tomcat-8/v8.0.26/bin/embed/apache-tomcat-8.0.26-embed.tar.gz.md5 dev/tomcat/tomcat-8/v8.0.26/bin/embed/apache-tomcat-8.0.26-embed.tar.gz.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/embed/apache-tomcat-8.0.26-embed.zip (with props) dev/tomcat/tomcat-8/v8.0.26/bin/embed/apache-tomcat-8.0.26-embed.zip.asc dev/tomcat/tomcat-8/v8.0.26/bin/embed/apache-tomcat-8.0.26-embed.zip.md5 dev/tomcat/tomcat-8/v8.0.26/bin/embed/apache-tomcat-8.0.26-embed.zip.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/extras/ dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-jmx-remote.jar.md5 dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-jmx-remote.jar.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.md5 dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar (with props) dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.asc dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.md5 dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.sha1 dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli.jar (with props) dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli.jar.asc dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli.jar.md5 dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomc
svn commit: r10206 [2/2] - in /dev/tomcat/tomcat-8: v8.0.25/ v8.0.26/ v8.0.26/bin/ v8.0.26/bin/embed/ v8.0.26/bin/extras/ v8.0.26/src/
Added: dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.asc == --- dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.asc (added) +++ dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.asc Tue Aug 18 12:11:44 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJV0xl/AAoJEBDAHFovYFnnrp4QAJT26S76b1AvFhlSBWAHU0VL +iMOXIoSk4hYl9/ay54SHK3PGN3J6WIJO3q23M1SJsiBwZX97tRCp1p+a6sqquRtK +n4dPqXiyIkPIYfwy4EyfPCNJaaSBlktC9acnr5BjIqhw1uyveIJtzbEUCOp+Y99x +TJQYK6D2IkQqKoPKfdKjrb1JCTOcMse4eqHxIUweD8WavHKsB4ZWYBTzKyLP62wd +Jcp9oek4ew5DLOvCH7Gr7VcZKVu8tEaHQ/pKQaWhI7jcRPn+iOfRFCHdIqTGYGl0 +NA4or5fu8CYWJlnbv+7LHfS/15dlBNt/+Yt8E1krDq9nzHTQhHMHcd6o5dL9DdzU +M5ucV7SKCCYHKgCIjcYHY/0qf1DYtazRJ4DLq7u8s7W+ayKfGbc/Q55cThAKKv9T +NeUgxxB6dSMY+sjtCrLMp3cNeu2d9hTS/0hI9tgnfQ5ryRWReq6A+K6m2wMyFqYR +C78R1ZTf6mCDGbdFgUj8mAPgJUQFWTVetLRPOSXjcM/zxbHZcTfRrWFv14I5XRSh +3nNjxiqq9/NnA7vSbEhVzZwobnWZiDXwjnU+ApkCyEMwHPZFbTS0hSv90cFoUuNS +dZMzGUs1avxvyhMvHWcjsEqzxtPVitii45XKyyZyhw9tuLyxld7XvZUzN1XlHQM3 +xeIeAF+Olz5p7HeanZ9y +=62XQ +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.md5 == --- dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.md5 Tue Aug 18 12:11:44 2015 @@ -0,0 +1 @@ +aa5defa144ee508ba8644f39869dc035 *catalina-ws.jar \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.sha1 == --- dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.sha1 (added) +++ dev/tomcat/tomcat-8/v8.0.26/bin/extras/catalina-ws.jar.sha1 Tue Aug 18 12:11:44 2015 @@ -0,0 +1 @@ +06a82e36fe18ca2c5b8a0ae57a206b8cd9bbb5da *catalina-ws.jar \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.asc == --- dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.asc (added) +++ dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.asc Tue Aug 18 12:11:44 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJV0xl+AAoJEBDAHFovYFnnWgYQALCogCohUa0exW8f0AkjAnuN +K5w8exJ1Tg0y3+ucZRzvpwdSOtIcJyGTDFTW9gc5AWH0dM8+M7qnwn5q47gGvCvS +AYguxbDnEcJ+cdFiobJME8idtGwk8Cl+MqYW7FNWS5UJGstr7N0QHj2BpGEbsyTB +4eh5W5V8gIS/q2bt96T/Lr3MT+gXvrgAFRs3BnKZGbqdFpON9UZYuXI6QNDFdEZj +ZT/B8Vh1n1xd05/gM/C+HdO4qBSSt90OelE4pcb3X5/K19zXV2BIUZq2GuhxuEnw +ubFJ+WGonE87mDM8eFYewb9dhuPOqBkN/3eLz9oaiiXE8YiyJ3trjT3J6NWV/v03 ++u0eOFeAY3aCmMRnvgTCsl3RFAlQrTsfcgAQ/2pGzMjtbkt+HjBa0L3VZaR0fOt/ +aIDRNMvHfKRjaK2DIPItkOg/oIVrOhdS5Ziv/Py26wXN9OqDdacFoyHjlzMQN+3R +kzlvC9M9fYQ44je5+SRBCfoeS+JOasQ5oOVB0C3RWbSIp9kS3XchE6vgVYdShb4s +s73VUBeZ0KvXH1uhxwahwpSbeAPvXDE1iR0kVVIoo0c0Doyoeu65zON0mEhjOajy +sj+x/DpX9vUb1Hk/Z2rH0H33+iTsMTZ/fSzpHiICkqUAUN+Ug+mnKuskUHgsfpWg +kHG9pd4QtAqgxorUts18 +=1zQ5 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.md5 == --- dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.md5 (added) +++ dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.md5 Tue Aug 18 12:11:44 2015 @@ -0,0 +1 @@ +26782378485c25e728295989f056eed7 *tomcat-juli-adapters.jar \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.sha1 == --- dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.sha1 (added) +++ dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli-adapters.jar.sha1 Tue Aug 18 12:11:44 2015 @@ -0,0 +1 @@ +5b5a5c864e008a02fe92c748f90bd6b68790d6cc *tomcat-juli-adapters.jar \ No newline at end of file Added: dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli.jar.asc == --- dev/tomcat/tomcat-8/v8.0.26/bin/extras/tomcat-juli.jar.asc (add
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/154 Buildbot URL: http://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] 1696406 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
Re: svn commit: r1696404 - /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
On 18/08/2015 12:58, Konstantin Kolinko wrote:
> 2015-08-18 14:44 GMT+03:00 :
>> Author: markt
>> Date: Tue Aug 18 11:44:43 2015
>> New Revision: 1696404
>>
>> URL: http://svn.apache.org/r1696404
>> Log:
>> Remove unused code
>>
>> Modified:
>>
>> tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
>>
>> Modified:
>> tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java?rev=1696404&r1=1696403&r2=1696404&view=diff
>> ==
>> ---
>> tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
>> (original)
>> +++
>> tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
>> Tue Aug 18 11:44:43 2015
>> @@ -37,7 +37,6 @@ public final class DrawMessage {
>> private byte colorR, colorG, colorB, colorA;
>> private double thickness;
>> private double x1, y1, x2, y2;
>> -private boolean lastInChain;
>>
>> /**
>> * The type.
>> @@ -108,23 +107,10 @@ public final class DrawMessage {
>> this.y2 = y2;
>> }
>>
>> -/**
>> - * Specifies if this DrawMessage is the last one in a chain
>> - * (e.g. a chain of brush paths).
>> - * Currently it is unused.
>> - */
>> -public boolean isLastInChain() {
>> -return lastInChain;
>> -}
>> -public void setLastInChain(boolean lastInChain) {
>> -this.lastInChain = lastInChain;
>> -}
>> -
>> -
>>
>> public DrawMessage(int type, byte colorR, byte colorG, byte colorB,
>> byte colorA, double thickness, double x1, double x2, double y1,
>> -double y2, boolean lastInChain) {
>> +double y2) {
>>
>> this.type = type;
>> this.colorR = colorR;
>> @@ -136,7 +122,6 @@ public final class DrawMessage {
>> this.x2 = x2;
>> this.y1 = y1;
>> this.y2 = y2;
>> -this.lastInChain = lastInChain;
>> }
>>
>>
>> @@ -203,8 +188,7 @@ public final class DrawMessage {
>>
>> return type + "," + (colorR & 0xFF) + "," + (colorG & 0xFF) + ","
>> + (colorB & 0xFF) + "," + (colorA & 0xFF) + "," + thickness
>> -+ "," + x1 + "," + y1 + "," + x2 + "," + y2 + ","
>> -+ (lastInChain ? "1" : "0");
>> ++ "," + x1 + "," + y1 + "," + x2 + "," + y2;
>> }
>>
>> public static DrawMessage parseFromString(String str)
>> @@ -214,7 +198,6 @@ public final class DrawMessage {
>> byte[] colors = new byte[4];
>> double thickness;
>> double[] coords = new double[4];
>> -boolean last;
>>
>> try {
>> String[] elements = str.split(",");
>> @@ -238,15 +221,13 @@ public final class DrawMessage {
>> + coords[i]);
>> }
>>
>> -last = !"0".equals(elements[10]);
>> -
>
> I think the above condition can have either value. It is not always
> false. As such, I think removing the "last" flag below is wrong.
>
> You can remove getter/setter in DrawMessage, but DrawMessage
> constructor argument (as passed below) is used.
>
> The value of that property is used (directly, without calling a
> getter) in the following fragment above:
It is only ever used to construct the wire representation from a
DrawMessage and when constructing a DrawMessage from the wire
representation.
I don't see it being used outside of those two uses so I see no
requirement to keep it.
Mark
>>> -+ "," + x1 + "," + y1 + "," + x2 + "," + y2 + ","
>>> -+ (lastInChain ? "1" : "0");
>>> ++ "," + x1 + "," + y1 + "," + x2 + "," + y2;
>
>
>> } catch (RuntimeException ex) {
>> throw new ParseException(ex);
>> }
>>
>> DrawMessage m = new DrawMessage(type, colors[0], colors[1],
>> colors[2], colors[3], thickness, coords[0], coords[2],
>> -coords[1], coords[3], last);
>> +coords[1], coords[3]);
>>
>> return m;
>> }
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 8.0.26
The proposed Apache Tomcat 8.0.26 release is now available for voting. This fixes the BOM issue with changelog.xml in the 8.0.25 tag. The main changes since 8.0.24 are: - Fix EOF handling in the AJP APR/native connector to avoid the tight loop that caused high CPU load - Avoid an NPE when adding POJO WEebSocket endpoints programmatically - Improved handling of async timeouts There is the usual collection of bug fixes, new features and performance improvements. For full details, see the changelog: http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.26/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1049/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_26/ The proposed 8.0.26 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.0.26 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696413 - /tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Author: markt
Date: Tue Aug 18 12:53:41 2015
New Revision: 1696413
URL: http://svn.apache.org/r1696413
Log:
Add missing i18n String
Modified:
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1696413&r1=1696412&r2=1696413&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Tue Aug
18 12:53:41 2015
@@ -77,15 +77,16 @@ streamStateMachine.invalidFrame=Connecti
upgradeHandler.allocate.debug=Connection [{0}], Stream [{1}], allocated [{2}]
bytes
upgradeHandler.allocate.left=Connection [{0}], Stream [{1}], [{2}] bytes
unallocated - trying to allocate to children
upgradeHandler.allocate.recipient=Connection [{0}], Stream [{1}], potential
recipient [{2}] with weight [{3}]
-upgradeHandler.noNewStreams=Connection [{0}], Stream [{1}], Stream ignored as
no new streams are permitted on this connection
-upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], RST
(closing stream)
+upgradeHandler.connectionError=Connection error
upgradeHandler.goaway.debug=Connection [{0}], Goaway, Last stream [{1}], Error
code [{2}], Debug data [{3}]
upgradeHandler.init=Connection [{0}]
upgradeHandler.initialWindowSize.invalid=Connection [{0}], Illegal value of
[{1}] ignored for initial window size
upgradeHandler.invalidPreface=Connection [{0}], Invalid connection preface
upgradeHandler.ioerror=Connection [{0}]
+upgradeHandler.noNewStreams=Connection [{0}], Stream [{1}], Stream ignored as
no new streams are permitted on this connection
upgradeHandler.pause.entry=Connection [{0}] Pausing
upgradeHandler.pingFailed=Connection [{0}] Failed to send ping to client
+upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], RST
(closing stream)
upgradeHandler.sendPrefaceFail=Failed to send preface to client
upgradeHandler.socketCloseFailed=Error closing socket
upgradeHandler.stream.closed=Stream [{0}] has been closed for some time
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696414 - /tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
Author: markt
Date: Tue Aug 18 13:03:11 2015
New Revision: 1696414
URL: http://svn.apache.org/r1696414
Log:
Fix HTTP2 6.1 test case failure.
Validate data frame padding before sending notifications for that frame in case
the padding is invalid. In that case we do not want to process the data part of
the frame.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1696414&r1=1696413&r2=1696414&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Tue Aug 18
13:03:11 2015
@@ -168,12 +168,22 @@ class Http2Parser {
ByteBuffer dest = output.getInputByteBuffer(streamId, dataLength);
if (dest == null) {
swallow(streamId, dataLength, false);
+// Process padding before sending any notifications in case padding
+// is invalid.
+if (padLength > 0) {
+swallow(streamId, padLength, true);
+}
if (endOfStream) {
output.receiveEndOfStream(streamId);
}
} else {
synchronized (dest) {
input.fill(true, dest, dataLength);
+// Process padding before sending any notifications in case
+// padding is invalid.
+if (padLength > 0) {
+swallow(streamId, padLength, true);
+}
if (endOfStream) {
output.receiveEndOfStream(streamId);
}
@@ -181,7 +191,6 @@ class Http2Parser {
}
}
if (padLength > 0) {
-swallow(streamId, padLength, true);
output.swallowedPadding(streamId, padLength);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/155 Buildbot URL: http://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] 1696413 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [CANCELLED][VOTE] Release Apache Tomcat 8.0.25
Mark, On 8/18/15 7:13 AM, Mark Thomas wrote: > On 17/08/2015 22:11, Mark Thomas wrote: >> On 17/08/2015 22:09, Christopher Schultz wrote: >>> Mark, >>> >>> On 8/17/15 4:54 PM, Mark Thomas wrote: On 17/08/2015 21:10, Christopher Schultz wrote: > Mark, > > On 8/17/15 1:46 PM, Mark Thomas wrote: >> The proposed Apache Tomcat 8.0.25 release is now available for voting. >> >> The main changes since 8.0.24 are: >> >> - Fix EOF handling in the AJP APR/native connector to avoid the tight >> loop that caused high CPU load >> >> - Avoid an NPE when adding POJO WEebSocket endpoints programmatically >> >> - Improved handling of async timeouts >> >> >> There is the usual collection of bug fixes, new features and >> performance improvements. For full details, see the changelog: >> http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml >> >> It can be obtained from: >> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.25/ >> The Maven staging repo is: >> https://repository.apache.org/content/repositories/orgapachetomcat-1048/ >> The svn tag is: >> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_25/ >> >> The proposed 8.0.24 release is: >> [ ] Broken - do not release >> [ ] Stable - go ahead and release as 8.0.25 > > The standard build is broken: I must have used Notepad rather than Notepad2 to edit changelog.xml to create the tag without the 'in development' release text and it added the BOM. > > I'm cancelling the vote due to the above error and will be tagging > 8.0.26 shortly. :( The unit tests finally completed on 8.0.25. -chris signature.asc Description: OpenPGP digital signature
svn commit: r1696424 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java
Author: markt Date: Tue Aug 18 14:15:21 2015 New Revision: 1696424 URL: http://svn.apache.org/r1696424 Log: Import order Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java?rev=1696424&r1=1696423&r2=1696424&view=diff == --- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java (original) +++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_3.java Tue Aug 18 14:15:21 2015 @@ -16,11 +16,12 @@ */ package org.apache.coyote.http2; -import org.apache.juli.logging.Log; -import org.apache.juli.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + /** * Unit tests for Section 5.3 of * https://tools.ietf.org/html/rfc7540";>RFC 7540. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696425 - /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Author: markt
Date: Tue Aug 18 14:16:09 2015
New Revision: 1696425
URL: http://svn.apache.org/r1696425
Log:
Trivial Javadoc commit to trigger a CI build
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java?rev=1696425&r1=1696424&r2=1696425&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Tue Aug 18 14:16:09 2015
@@ -341,7 +341,8 @@ public final class Room {
* runnable on this Room, it will not be executed recursively, but instead
* cached until the original runnable is finished, to keep the behavior of
* using a Executor.
- * @param task
+ *
+ * @param task The task to be executed
*/
public void invokeAndWait(Runnable task) {
@@ -468,8 +469,9 @@ public final class Room {
/**
* Handles the given DrawMessage by drawing it onto this Room's
* image and by broadcasting it to the connected players.
- * @param msg
- * @param msgId
+ *
+ * @param msg The draw message received
+ * @param msgId The ID for the draw message recieved
*/
public void handleDrawMessage(DrawMessage msg, long msgId) {
room.internalHandleDrawMessage(this, msg, msgId);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58258] New: cpu spike upgrade from tomcat 6.0.x to tomcat 7.0.57
https://bz.apache.org/bugzilla/show_bug.cgi?id=58258 Bug ID: 58258 Summary: cpu spike upgrade from tomcat 6.0.x to tomcat 7.0.57 Product: Tomcat 7 Version: 7.0.57 Hardware: Other OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: neet.musa...@gmail.com Hello, ugraded tomcat from 6.0.36(jdk 6) to tomcat7.0.57 (jdk7).. os:centos 6.6 ...seeing high cpu spike after upgrade doing top and thread dump shows only thread that is always using cpu is: "ContainerBackgroundProcessor[StandardEngine[Catalina]]" daemon prio=10 tid=0x7ff8fc599800 nid=0xc1d2e waiting on condition [0x7ff803ffe000] java.lang.Thread.State: TIMED_WAITING (sleeping) at java.lang.Thread.sleep(Native Method) at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1513) at java.lang.Thread.run(Thread.java:745) disabled backgroundProcessorDelay (backgroundProcessorDelay=-1) ..don't see any thread that is always using cpu.. Q: why backgroundProcessorDelay will cause cpu spike. Is this disabled in tomcat6 by default? Q: will disabling backgroundProcessorDelay cause any other performance issues with tomcat7. Regards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58259] New: JNDIRealm fails when server disconnects after time
https://bz.apache.org/bugzilla/show_bug.cgi?id=58259 Bug ID: 58259 Summary: JNDIRealm fails when server disconnects after time Product: Tomcat 8 Version: 8.0.22 Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: major Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: adnan_za...@cable.comcast.com I can see this exception created in my log file from time to time. This bug has been reported before in several previous versions of Tomcat. 17-Aug-2015 17:48:33.056 INFO [http-nio-8180-exec-120] org.apache.catalina.realm.JNDIRealm.authenticate Exception performing authentication. Retrying... javax.naming.CommunicationException [Root exception is java.net.SocketException: Connection reset]; remaining name 'DC=comcast,DC=com' at com.sun.jndi.ldap.LdapClient.authenticate(LdapClient.java:162) at com.sun.jndi.ldap.LdapCtx.connect(LdapCtx.java:2740) at com.sun.jndi.ldap.LdapCtx.ensureOpen(LdapCtx.java:2648) at com.sun.jndi.ldap.LdapCtx.ensureOpen(LdapCtx.java:2622) at com.sun.jndi.ldap.LdapCtx.doSearch(LdapCtx.java:1942) at com.sun.jndi.ldap.LdapCtx.searchAux(LdapCtx.java:1847) at com.sun.jndi.ldap.LdapCtx.c_search(LdapCtx.java:1772) at com.sun.jndi.toolkit.ctx.ComponentDirContext.p_search(ComponentDirContext.java:386) at com.sun.jndi.toolkit.ctx.PartialCompositeDirContext.search(PartialCompositeDirContext.java:356) at com.sun.jndi.toolkit.ctx.PartialCompositeDirContext.search(PartialCompositeDirContext.java:339) at javax.naming.directory.InitialDirContext.search(InitialDirContext.java:267) at org.apache.catalina.realm.JNDIRealm.getUserBySearch(JNDIRealm.java:1681) at org.apache.catalina.realm.JNDIRealm.getUser(JNDIRealm.java:1517) at org.apache.catalina.realm.JNDIRealm.getUser(JNDIRealm.java:1465) at org.apache.catalina.realm.JNDIRealm.authenticate(JNDIRealm.java:1406) at org.apache.catalina.realm.JNDIRealm.authenticate(JNDIRealm.java:1264) at org.apache.catalina.realm.CombinedRealm.authenticate(CombinedRealm.java:192) at org.apache.catalina.realm.LockOutRealm.authenticate(LockOutRealm.java:180) at org.apache.catalina.authenticator.FormAuthenticator.authenticate(FormAuthenticator.java:245) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:453) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:142) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79) at org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:617) at org.apache.catalina.authenticator.SingleSignOn.invoke(SingleSignOn.java:240) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:88) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:518) at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1091) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:668) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1527) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1484) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:745) Caused by: java.net.SocketException: Connection reset at java.net.SocketInputStream.read(SocketInputStream.java:196) at java.net.SocketInputStream.read(SocketInputStream.java:122) at java.io.BufferedInputStream.fill(BufferedInputStream.java:235) at java.io.BufferedInputStream.read1(BufferedInputStream.java:275) at java.io.BufferedInputStream.read(BufferedInputStream.java:334) at com.sun.jndi.ldap.Connection.run(Connection.java:853) ... 1 more -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58259] JNDIRealm fails when server disconnects after time
https://bz.apache.org/bugzilla/show_bug.cgi?id=58259 Adnan Zafar changed: What|Removed |Added Version|8.0.22 |8.0.24 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58258] cpu spike upgrade from tomcat 6.0.x to tomcat 7.0.57
https://bz.apache.org/bugzilla/show_bug.cgi?id=58258 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Mark Thomas --- Bugzilla is not a support forum. Please use the users mailing list. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58259] JNDIRealm fails when server disconnects after time
https://bz.apache.org/bugzilla/show_bug.cgi?id=58259 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Bugzilla is not a support forum. Please use the users mailing list. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58259] JNDIRealm fails when server disconnects after time
https://bz.apache.org/bugzilla/show_bug.cgi?id=58259 --- Comment #2 from Adnan Zafar --- (In reply to Mark Thomas from comment #1) > Bugzilla is not a support forum. Please use the users mailing list. This is a bug that has been reported in other versions of Tomcat. How is this considered a support request? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: What API does the Tomcat DataSource Connection thread pool use to know a connection can be reused?
Christopher, On 8/17/15, 5:59 PM, "Christopher Schultz" wrote: >Philip, > >On 8/17/15 12:27 PM, Wernersbach, Philip wrote: >> We are developing a JDBC driver that implements the JDBC API. Our >> driver works and we can use it in servlets, but Tomcat doesn¹t seem >> to know that the connections in the thread pool can be reused, so >> after all of the connection slots in the thread pool are used, the >> servlets hang trying to get a connection. > >If you set maxTotal="1", you get a timeout when you try to fetch a >second connection? Yes. To test this I modified the code and got two connections consecutively, and it hung on getting the second connection. >Are you sure the servlet called Connection.close()? That seemed to be the problem. I audited our code and found a corner case where Connection.close() was not called. I fixed it, and all seems to work as it should. > >What does the stack trace of the request-processing thread look like >when it's hung up? It hung at DataSource.getConnection() with this stack trace: Unsafe.park(boolean, long) line: not available [native method] LockSupport.park(Object) line: 175 AbstractQueuedSynchronizer$ConditionObject.await() line: 2039 LinkedBlockingDeque.takeFirst() line: 582 GenericObjectPool.borrowObject(long) line: 439 GenericObjectPool.borrowObject() line: 360 PoolingDataSource.getConnection() line: 133 BasicDataSource.getConnection() line: 1532 IngDb.getDbConnection() line: 42 > >> What API does the Tomcat DataSource Connection thread pool use to >> know a connection can be reused? This is an API question, but our >> specific version of Tomcat is 8.0.24. > >Are you using DBCP2 (the default) or Tomcat's jdbc-pool? DBCP2 > >Do you mean to check to see if a connection is valid for re-use? Our servlet code doesn¹t need to check if a connection is valid for re-use, we just need Tomcat to know that our connections are always valid for re-use in the pool (the database connection is automatically kept alive until it is explicitly closed). > >I think the answer for /both/ is that they use this call: > > Connection.isValid(int timeout) > >What version of JDBC are you implementing? It seems that Java 6 is when >the Connection.isValid method was added. JDBC 4.2, which does have Connection.isValid(), we¹ve implemented it. > >Or did you mean to check to see if a connection can be re-used *at all* >-- meaning, can the connection even really be used in a pool? > >What does your element look like in context.xml? > >-chris I¹m assuming Tomcat will automatically take care of pooling even though we¹re calling Connection.close()? Our close() implementation explicitly closes the database connection, in such a way that it can¹t be reused. Thanks, Philip Wernersbach Software Engineer Ingram Content - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696451 - in /tomcat/trunk/java/org/apache/coyote/http2: AbstractStream.java ConnectionSettings.java
Author: markt
Date: Tue Aug 18 16:27:19 2015
New Revision: 1696451
URL: http://svn.apache.org/r1696451
Log:
Rename
Modified:
tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java?rev=1696451&r1=1696450&r2=1696451&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java Tue Aug 18
16:27:19 2015
@@ -35,7 +35,7 @@ abstract class AbstractStream {
private volatile AbstractStream parentStream = null;
private final Set childStreams = new HashSet<>();
-private long windowSize = ConnectionSettings.DEFAULT_WINDOW_SIZE;
+private long windowSize = ConnectionSettings.DEFAULT_INITIAL_WINDOW_SIZE;
public Integer getIdentifier() {
return identifier;
Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java?rev=1696451&r1=1696450&r2=1696451&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java Tue Aug
18 16:27:19 2015
@@ -25,7 +25,7 @@ public class ConnectionSettings {
private final Log log = LogFactory.getLog(ConnectionSettings.class);
private final StringManager sm =
StringManager.getManager(ConnectionSettings.class);
-public static final int DEFAULT_WINDOW_SIZE = (1 << 16) - 1;
+public static final int DEFAULT_INITIAL_WINDOW_SIZE = (1 << 16) - 1;
private static final long UNLIMITED = ((long)1 << 32); // Use the maximum
possible
private static final int MAX_WINDOW_SIZE = (1 << 31) - 1;
@@ -38,7 +38,7 @@ public class ConnectionSettings {
private volatile boolean enablePush = true;
private volatile long maxConcurrentStreams = UNLIMITED;
-private volatile int initialWindowSize = DEFAULT_WINDOW_SIZE;
+private volatile int initialWindowSize = DEFAULT_INITIAL_WINDOW_SIZE;
private volatile int maxFrameSize = DEFAULT_MAX_FRAME_SIZE;
private volatile long maxHeaderListSize = UNLIMITED;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696452 - /tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
Author: markt
Date: Tue Aug 18 16:29:47 2015
New Revision: 1696452
URL: http://svn.apache.org/r1696452
Log:
Need different handling for local settings (settings the peer should be using
to talk to us) and remote settings (settings we should be using to talk to the
peer).
Add a new class to handle local settings.
Added:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
(with props)
Added: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsLocal.java?rev=1696452&view=auto
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
(added)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsLocal.java Tue
Aug 18 16:29:47 2015
@@ -0,0 +1,213 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.coyote.http2;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Represents the local connection settingsL i.e. the settings the client is
+ * expected to use when communicating with the server. There will be a delay
+ * between calling a setter and the setting taking effect at the client. When a
+ * setter is called, the new value is added to the set of pending settings.
Once
+ * the ACK is received, the new value is moved to the current settings. While
+ * waiting for the ACK, the getters will return the most lenient / generous /
+ * relaxed of the current setting and the pending setting. This class does not
+ * validate the values passed to the setters. If an invalid value is used the
+ * client will respond (almost certainly by closing the connection) as defined
+ * in the HTTP/2 specification.
+ */
+public class ConnectionSettingsLocal {
+
+private static final Integer KEY_HEADER_TABLE_SIZE = Integer.valueOf(1);
+private static final Integer KEY_ENABLE_PUSH = Integer.valueOf(2);
+private static final Integer KEY_MAX_CONCURRENT_STREAMS =
Integer.valueOf(3);
+private static final Integer KEY_INITAIL_WINDOW_SIZE = Integer.valueOf(4);
+private static final Integer KEY_MAX_FRAME_SIZE = Integer.valueOf(5);
+private static final Integer KEY_MAX_HEADER_LIST_SIZE = Integer.valueOf(6);
+
+private static final Long DEFAULT_HEADER_TABLE_SIZE =
+Long.valueOf(ConnectionSettingsRemote.DEFAULT_HEADER_TABLE_SIZE);
+private static final Long DEFAULT_ENABLE_PUSH = Long.valueOf(1);
+private static final Long DEFAULT_MAX_CONCURRENT_STREAMS =
+Long.valueOf(ConnectionSettingsRemote.UNLIMITED);
+private static final Long DEFAULT_INITIAL_WINDOW_SIZE =
+Long.valueOf(ConnectionSettingsRemote.DEFAULT_INITIAL_WINDOW_SIZE);
+private static final Long DEFAULT_MAX_FRAME_SIZE =
+Long.valueOf(ConnectionSettingsRemote.DEFAULT_MAX_FRAME_SIZE);
+private static final Long DEFAULT_MAX_HEADER_LIST_SIZE =
+Long.valueOf(ConnectionSettingsRemote.UNLIMITED);
+
+boolean sendInProgress = false;
+
+private Map current = new HashMap<>();
+private Map pending = new HashMap<>();
+
+
+public ConnectionSettingsLocal() {
+// Set up the defaults
+current.put(KEY_HEADER_TABLE_SIZE, DEFAULT_HEADER_TABLE_SIZE);
+current.put(KEY_ENABLE_PUSH,DEFAULT_ENABLE_PUSH);
+current.put(KEY_MAX_CONCURRENT_STREAMS,
DEFAULT_MAX_CONCURRENT_STREAMS);
+current.put(KEY_INITAIL_WINDOW_SIZE,DEFAULT_INITIAL_WINDOW_SIZE);
+current.put(KEY_MAX_FRAME_SIZE, DEFAULT_MAX_FRAME_SIZE);
+current.put(KEY_MAX_HEADER_LIST_SIZE, DEFAULT_MAX_HEADER_LIST_SIZE);
+}
+
+
+private synchronized void set(Integer key, long value) {
+checkSend();
+if (current.get(key).longValue() == value) {
+pending.remove(key);
+} else {
+pending.put(key, Long.valueOf(value));
+}
+}
+
+
+private synchronized long getMin(Integer key) {
+Long pendingValue = pending.get(key);
+long currentValue = current.get(key).longValue();
+if (pendingValue == null) {
+return currentV
svn commit: r1696454 - in /tomcat/trunk: java/org/apache/coyote/http2/ test/org/apache/coyote/http2/
Author: markt
Date: Tue Aug 18 16:32:12 2015
New Revision: 1696454
URL: http://svn.apache.org/r1696454
Log:
ConnectionSettings -> ConnectionSettingsRemote (the companion to
ConnectionSettingsLocal)
Added:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java
- copied, changed from r1696452,
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
Removed:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
Modified:
tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java?rev=1696454&r1=1696453&r2=1696454&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java Tue Aug 18
16:32:12 2015
@@ -35,7 +35,7 @@ abstract class AbstractStream {
private volatile AbstractStream parentStream = null;
private final Set childStreams = new HashSet<>();
-private long windowSize = ConnectionSettings.DEFAULT_INITIAL_WINDOW_SIZE;
+private long windowSize =
ConnectionSettingsRemote.DEFAULT_INITIAL_WINDOW_SIZE;
public Integer getIdentifier() {
return identifier;
Copied: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java
(from r1696452,
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java?p2=tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java&p1=tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java&r1=1696452&r2=1696454&rev=1696454&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java Tue
Aug 18 16:32:12 2015
@@ -20,13 +20,13 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-public class ConnectionSettings {
+public class ConnectionSettingsRemote {
-private final Log log = LogFactory.getLog(ConnectionSettings.class);
-private final StringManager sm =
StringManager.getManager(ConnectionSettings.class);
+private final Log log = LogFactory.getLog(ConnectionSettingsRemote.class);
+private final StringManager sm =
StringManager.getManager(ConnectionSettingsRemote.class);
public static final int DEFAULT_INITIAL_WINDOW_SIZE = (1 << 16) - 1;
-private static final long UNLIMITED = ((long)1 << 32); // Use the maximum
possible
+static final long UNLIMITED = ((long)1 << 32); // Use the maximum possible
private static final int MAX_WINDOW_SIZE = (1 << 31) - 1;
private static final int MIN_MAX_FRAME_SIZE = 1 << 14;
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1696454&r1=1696453&r2=1696454&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Parser.java Tue Aug 18
16:32:12 2015
@@ -44,7 +44,7 @@ class Http2Parser {
private volatile int headersCurrentStream = -1;
private volatile boolean headersEndStream = false;
-private volatile int maxPayloadSize =
ConnectionSettings.DEFAULT_MAX_FRAME_SIZE;
+private volatile int maxPayloadSize =
ConnectionSettingsRemote.DEFAULT_MAX_FRAME_SIZE;
Http2Parser(String connectionId, Input input, Output output) {
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1696454&r1=1696453&r2=1696454&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Aug
18 16:32:12 2015
@@ -114,8 +114,8 @@ public class Http2UpgradeHandler extends
new AtomicReference<>(ConnectionState.NEW);
private volatile long pausedNanoTime = Long.MAX_VALUE;
-private final ConnectionSettings remoteSettings = new ConnectionSettings();
-private final ConnectionSettings localSettings = new Conne
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/158 Buildbot URL: http://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] 1696454 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696459 - in /tomcat/trunk: java/org/apache/coyote/http2/ test/org/apache/coyote/http2/
Author: markt
Date: Tue Aug 18 17:06:22 2015
New Revision: 1696459
URL: http://svn.apache.org/r1696459
Log:
Switch the Http2UpgradeHandler to using ConnectionSettingsLocal
Fix TODO for sending non-default values in initial settings frame including
updating tests
Added:
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java
- copied, changed from r1696447,
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
Copied: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java
(from r1696447,
tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java?p2=tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java&p1=tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java&r1=1696447&r2=1696459&rev=1696459&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettings.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsRemote.java Tue
Aug 18 17:06:22 2015
@@ -20,13 +20,17 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-public class ConnectionSettings {
+/**
+ * Represents the remote connection settings: i.e. the settings the server must
+ * use when communicating with the client.
+ */
+public class ConnectionSettingsRemote {
-private final Log log = LogFactory.getLog(ConnectionSettings.class);
-private final StringManager sm =
StringManager.getManager(ConnectionSettings.class);
+private final Log log = LogFactory.getLog(ConnectionSettingsRemote.class);
+private final StringManager sm =
StringManager.getManager(ConnectionSettingsRemote.class);
-public static final int DEFAULT_WINDOW_SIZE = (1 << 16) - 1;
-private static final long UNLIMITED = ((long)1 << 32); // Use the maximum
possible
+public static final int DEFAULT_INITIAL_WINDOW_SIZE = (1 << 16) - 1;
+static final long UNLIMITED = ((long)1 << 32); // Use the maximum possible
private static final int MAX_WINDOW_SIZE = (1 << 31) - 1;
private static final int MIN_MAX_FRAME_SIZE = 1 << 14;
@@ -38,7 +42,7 @@ public class ConnectionSettings {
private volatile boolean enablePush = true;
private volatile long maxConcurrentStreams = UNLIMITED;
-private volatile int initialWindowSize = DEFAULT_WINDOW_SIZE;
+private volatile int initialWindowSize = DEFAULT_INITIAL_WINDOW_SIZE;
private volatile int maxFrameSize = DEFAULT_MAX_FRAME_SIZE;
private volatile long maxHeaderListSize = UNLIMITED;
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1696459&r1=1696458&r2=1696459&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Aug
18 17:06:22 2015
@@ -115,7 +115,7 @@ public class Http2UpgradeHandler extends
private volatile long pausedNanoTime = Long.MAX_VALUE;
private final ConnectionSettingsRemote remoteSettings = new
ConnectionSettingsRemote();
-private final ConnectionSettingsRemote localSettings = new
ConnectionSettingsRemote();
+private final ConnectionSettingsLocal localSettings = new
ConnectionSettingsLocal();
private HpackDecoder hpackDecoder;
private HpackEncoder hpackEncoder;
@@ -205,9 +205,9 @@ public class Http2UpgradeHandler extends
}
// Send the initial settings frame
-// TODO: Need to send non-default settings values
try {
-socketWrapper.write(true, SETTINGS_EMPTY, 0,
SETTINGS_EMPTY.length);
+byte[] settings = localSettings.getSettingsFrameForPending();
+socketWrapper.write(true, settings, 0, settings.length);
socketWrapper.flush(true);
} catch (IOException ioe) {
throw new
IllegalStateException(sm.getString("upgradeHandler.sendPrefaceFail"), ioe);
@@ -810,25 +810,13 @@ public class Http2UpgradeHandler extends
}
-/*
- * This only has an effect if called before the connection is established
- */
public void setMaxConcurrentStreams(long maxConcurrentStreams) {
localSettings.setMaxConcurrentStreams(maxConcurrentStreams);
}
-/*
- * This only has an effect if called before the connection is established
- */
public void setInitialWindowSize(int initi
Re: What API does the Tomcat DataSource Connection thread pool use to know a connection can be reused?
Philip, On 8/18/15 11:42 AM, Wernersbach, Philip wrote: > Christopher, > > On 8/17/15, 5:59 PM, "Christopher Schultz" > wrote: > >> Philip, >> >> On 8/17/15 12:27 PM, Wernersbach, Philip wrote: >>> We are developing a JDBC driver that implements the JDBC API. Our >>> driver works and we can use it in servlets, but Tomcat doesn¹t seem >>> to know that the connections in the thread pool can be reused, so >>> after all of the connection slots in the thread pool are used, the >>> servlets hang trying to get a connection. >> >> If you set maxTotal="1", you get a timeout when you try to fetch a >> second connection? > > Yes. To test this I modified the code and got two connections > consecutively, and it hung on getting the second connection. Did you return the first one before requesting a second one? >> Are you sure the servlet called Connection.close()? > > That seemed to be the problem. I audited our code and found a corner case > where Connection.close() was not called. I fixed it, and all seems to work > as it should. Good. >> What does the stack trace of the request-processing thread look like >> when it's hung up? > > It hung at DataSource.getConnection() with this stack trace: > > Unsafe.park(boolean, long) line: not available [native method] > LockSupport.park(Object) line: 175 > AbstractQueuedSynchronizer$ConditionObject.await() line: 2039 > LinkedBlockingDeque.takeFirst() line: 582 > GenericObjectPool.borrowObject(long) line: 439 > GenericObjectPool.borrowObject() line: 360 > PoolingDataSource.getConnection() line: 133 > BasicDataSource.getConnection() line: 1532 > IngDb.getDbConnection() line: 42 I think this is expected behavior; when all the connections are checked-out, client code has to wait for a connection to be returned, or for the pool to consider the connection to be "abandoned", evict the abandoned connection from the pool, and create a new connection (which can then be given-out to clients). >>> What API does the Tomcat DataSource Connection thread pool use to >>> know a connection can be reused? This is an API question, but our >>> specific version of Tomcat is 8.0.24. >> >> Are you using DBCP2 (the default) or Tomcat's jdbc-pool? > > DBCP2 > >> >> Do you mean to check to see if a connection is valid for re-use? > > Our servlet code doesn¹t need to check if a connection is valid for > re-use, we just need Tomcat to know that our connections are always valid > for re-use in the pool (the database connection is automatically kept > alive until it is explicitly closed). > >> >> I think the answer for /both/ is that they use this call: >> >> Connection.isValid(int timeout) >> >> What version of JDBC are you implementing? It seems that Java 6 is when >> the Connection.isValid method was added. > > JDBC 4.2, which does have Connection.isValid(), we¹ve implemented it. > >> >> Or did you mean to check to see if a connection can be re-used *at all* >> -- meaning, can the connection even really be used in a pool? >> >> What does your element look like in context.xml? >> >> -chris > > I¹m assuming Tomcat will automatically take care of pooling even though > we¹re calling Connection.close()? Our close() implementation explicitly > closes the database connection, in such a way that it can¹t be reused. When client code calls Connection.close(), they are calling close() on a wrapper object. Your code won't see these close() calls because the pooled connections will intercept them and the connections will be returned to the pool. If/when the pool is shut-down, your Connection objects should see a .close() call. I'm concerned about your lack of understanding of the way a connection pool works and inability to debug it sufficiently before asking in this forum, if you are to be implementing a JDBC driver. :/ -chris signature.asc Description: OpenPGP digital signature
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/159 Buildbot URL: http://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] 1696459 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696467 - in /tomcat/trunk/webapps/docs: building.xml config/cluster-interceptor.xml config/cluster-sender.xml config/credentialhandler.xml config/sessionidgenerator.xml ssl-howto.xml
Author: fschumacher
Date: Tue Aug 18 17:42:50 2015
New Revision: 1696467
URL: http://svn.apache.org/r1696467
Log:
Remove doubled words and one s/by/but/
Modified:
tomcat/trunk/webapps/docs/building.xml
tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
tomcat/trunk/webapps/docs/config/cluster-sender.xml
tomcat/trunk/webapps/docs/config/credentialhandler.xml
tomcat/trunk/webapps/docs/config/sessionidgenerator.xml
tomcat/trunk/webapps/docs/ssl-howto.xml
Modified: tomcat/trunk/webapps/docs/building.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1696467&r1=1696466&r2=1696467&view=diff
==
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Tue Aug 18 17:42:50 2015
@@ -71,7 +71,7 @@ Unpack the binary distribution into a co
Ant release resides in its own directory (conventionally named
apache-ant-1.9.x). For the remainder of this guide,
the symbolic name ${ant.home} is used to refer to the full
pathname of
- the Ant installation directory directory.
+ the Ant installation directory.
Modified: tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1696467&r1=1696466&r2=1696467&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-interceptor.xml Tue Aug 18
17:42:50 2015
@@ -214,7 +214,7 @@
3. byte array in string form, for example {216,123,12,3}
- The logical cluster domain for this this static member listens for
cluster messages.
+ The logical cluster domain for that this static member listens for
cluster messages.
Two different type of values are possible:
1. Regular string values like "staging-domain" or
"tomcat-cluster" will be converted into bytes
using ISO-8859-1 encoding.
Modified: tomcat/trunk/webapps/docs/config/cluster-sender.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-sender.xml?rev=1696467&r1=1696466&r2=1696467&view=diff
==
--- tomcat/trunk/webapps/docs/config/cluster-sender.xml (original)
+++ tomcat/trunk/webapps/docs/config/cluster-sender.xml Tue Aug 18 17:42:50 2015
@@ -60,7 +60,7 @@
- The nested element is is not required, by
encouraged, as this is where
+ The nested element is not required, but
encouraged, as this is where
you would set all the socket options for the outgoing messages. Please see
its attributes below.
There are two implementations, in a similar manner to the receiver, one is non-blocking
based and the other is built using blocking IO.
Modified: tomcat/trunk/webapps/docs/config/credentialhandler.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/credentialhandler.xml?rev=1696467&r1=1696466&r2=1696467&view=diff
==
--- tomcat/trunk/webapps/docs/config/credentialhandler.xml (original)
+++ tomcat/trunk/webapps/docs/config/credentialhandler.xml Tue Aug 18 17:42:50
2015
@@ -123,7 +123,7 @@
-The length of the randomly generated salt to use use when creating a
+The length of the randomly generated salt to use when creating a
new stored credential from a clear text credential.
@@ -186,7 +186,7 @@
-The length of the randomly generated salt to use use when creating a
+The length of the randomly generated salt to use when creating a
new stored credential from a clear text credential.
Modified: tomcat/trunk/webapps/docs/config/sessionidgenerator.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/sessionidgenerator.xml?rev=1696467&r1=1696466&r2=1696467&view=diff
==
--- tomcat/trunk/webapps/docs/config/sessionidgenerator.xml (original)
+++ tomcat/trunk/webapps/docs/config/sessionidgenerator.xml Tue Aug 18 17:42:50
2015
@@ -35,7 +35,7 @@
The SessionIdGenerator element represents the session
- id generator that will be used to create create session ids used by
+ id generator that will be used to create session ids used by
web application HTTP sessions.
A SessionIdGenerator element MAY be nested inside a
Modified: tomcat/trunk/webapps/docs/ssl-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/ssl-howto.xml?rev=1696467&r1=1696466&r2=1696467&view=diff
==
--- tomcat/trunk/webapps/docs/ssl-howto.xml (original)
+++ tomcat/trunk/w
svn commit: r1696468 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/ webapps/docs/config/
Author: fschumacher Date: Tue Aug 18 17:46:20 2015 New Revision: 1696468 URL: http://svn.apache.org/r1696468 Log: Remove doubled words and one s/by/but/ Merged r1696467 from /tomcat/trunk Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/building.xml tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-interceptor.xml tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-sender.xml tomcat/tc8.0.x/trunk/webapps/docs/config/credentialhandler.xml tomcat/tc8.0.x/trunk/webapps/docs/config/sessionidgenerator.xml tomcat/tc8.0.x/trunk/webapps/docs/ssl-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 18 17:46:20 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582 6,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,169001
svn commit: r1696470 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/building.xml webapps/docs/config/cluster-interceptor.xml webapps/docs/config/cluster-sender.xml webapps/docs/config/sessionidgenerator.
Author: fschumacher Date: Tue Aug 18 17:49:57 2015 New Revision: 1696470 URL: http://svn.apache.org/r1696470 Log: Remove doubled words and one s/by/but/ Merged r1696468 from /tomcat/tc8.0.x/trunk (Merged r1696467 from /tomcat/trunk) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/building.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-interceptor.xml tomcat/tc7.0.x/trunk/webapps/docs/config/cluster-sender.xml tomcat/tc7.0.x/trunk/webapps/docs/config/sessionidgenerator.xml tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 18 17:49:57 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/160 Buildbot URL: http://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] 1696467 Blamelist: fschumacher 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
buildbot exception in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/49 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1696470 Blamelist: fschumacher BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696479 - /tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
Author: markt
Date: Tue Aug 18 18:37:10 2015
New Revision: 1696479
URL: http://svn.apache.org/r1696479
Log:
INterface allows the correct exception to be thrown so do so.
Modified:
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1696479&r1=1696478&r2=1696479&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Tue Aug 18
18:37:10 2015
@@ -729,17 +729,12 @@ public abstract class Http2TestBase exte
@Override
-public void settingsEnd(boolean ack) {
+public void settingsEnd(boolean ack) throws IOException {
if (ack) {
trace.append("0-Settings-Ack\n");
} else {
trace.append("0-Settings-End\n");
-try {
-sendSettings(0, true);
-} catch (IOException ioe) {
-// Convert to uncaught exception
-throw new IllegalStateException(ioe);
-}
+sendSettings(0, true);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/161 Buildbot URL: http://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] 1696479 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/71 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1696468 Blamelist: fschumacher Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696503 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Author: markt
Date: Tue Aug 18 20:41:48 2015
New Revision: 1696503
URL: http://svn.apache.org/r1696503
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1696503&r1=1696502&r2=1696503&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Aug
18 20:41:48 2015
@@ -90,7 +90,6 @@ public class Http2UpgradeHandler extends
private static final byte[] PING = { 0x00, 0x00, 0x08, 0x06, 0x00, 0x00,
0x00, 0x00, 0x00};
private static final byte[] PING_ACK = { 0x00, 0x00, 0x08, 0x06, 0x01,
0x00, 0x00, 0x00, 0x00 };
-private static final byte[] SETTINGS_EMPTY = { 0x00, 0x00, 0x00, 0x04,
0x00, 0x00, 0x00, 0x00, 0x00 };
private static final byte[] SETTINGS_ACK = { 0x00, 0x00, 0x00, 0x04, 0x01,
0x00, 0x00, 0x00, 0x00 };
private static final byte[] GOAWAY = { 0x07, 0x00, 0x00, 0x00, 0x00, 0x00
};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1696508 - in /tomcat/trunk: java/org/apache/coyote/http2/FrameType.java test/org/apache/coyote/http2/TestHttp2Section_6_9.java
Author: markt
Date: Tue Aug 18 21:38:01 2015
New Revision: 1696508
URL: http://svn.apache.org/r1696508
Log:
Add some initial tests for section 6.9
Fix a bug in the HTTP/2 parsers handling of window update frames with the wrong
length (it should trigger a connection error)
Added:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java (with
props)
Modified:
tomcat/trunk/java/org/apache/coyote/http2/FrameType.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/FrameType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/FrameType.java?rev=1696508&r1=1696507&r2=1696508&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/FrameType.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/FrameType.java Tue Aug 18
21:38:01 2015
@@ -30,7 +30,7 @@ public enum FrameType {
PUSH_PROMISE (5, false, true, (x) -> x >= 4, true),
PING (6,true, false, (x) -> x == 8, false),
GOAWAY(7,true, false, (x) -> x >= 8, false),
-WINDOW_UPDATE (8,true, true, (x) -> x == 4, false),
+WINDOW_UPDATE (8,true, true, (x) -> x == 4, true),
CONTINUATION (9, false, true, null, true),
UNKNOWN (256, true, true, null, false);
Added: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java?rev=1696508&view=auto
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java (added)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java Tue Aug
18 21:38:01 2015
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.coyote.http2;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Unit tests for Section 6.9 of
+ * https://tools.ietf.org/html/rfc7540";>RFC 7540.
+ *
+ * The order of tests in this class is aligned with the order of the
+ * requirements in the RFC.
+ */
+public class TestHttp2Section_6_9 extends Http2TestBase {
+
+@Test
+public void testZeroWindowUpdateConnection() throws Exception {
+http2Connect();
+
+sendWindowUpdate(0, 0);
+
+parser.readFrame(true);
+
+Assert.assertTrue(output.getTrace(), output.getTrace().startsWith(
+"0-Goaway-[1]-[" + Http2Error.PROTOCOL_ERROR.getCode() +
"]-["));
+}
+
+
+@Test
+public void testZeroWindowUpdateStream() throws Exception {
+http2Connect();
+
+sendPriority(3, 0, 15);
+
+sendWindowUpdate(3, 0);
+
+parser.readFrame(true);
+
+Assert.assertEquals("3-RST-[" + Http2Error.PROTOCOL_ERROR.getCode() +
"]",
+output.getTrace());
+}
+
+
+@Test
+public void testWindowUpdateOnClosedStream() throws Exception {
+http2Connect();
+
+// Should not be an error so should be nothing to read
+sendWindowUpdate(1, 200);
+
+// So the next request should process normally
+sendSimpleGetRequest(3);
+readSimpleGetResponse();
+Assert.assertEquals(getSimpleResponseTrace(3), output.getTrace());
+}
+
+
+// TODO: Test always accounting for changes in flow control windows even if
+// the frame is in error.
+
+
+@Test
+public void testWindowUpdateWrongLength() throws Exception {
+http2Connect();
+
+byte[] zeroLengthWindowFrame = new byte[9];
+// Length zero
+ByteUtil.setOneBytes(zeroLengthWindowFrame, 3,
FrameType.WINDOW_UPDATE.getIdByte());
+// No flags
+// Stream 1
+ByteUtil.set31Bits(zeroLengthWindowFrame, 5, 1);
+
+os.write(zeroLengthWindowFrame);
+os.flush();
+
+parser.readFrame(true);
+
+Assert.assertTrue(output.getTrace(), output.getTrace().startsWith(
+"0-Goaway-[1]-[" + Http2Error.FRAME_SIZE_ERROR.getCode() +
"]-["));
+}
+
+// TODO: Remaining 6.9 tests
+}
Propchange: tomcat/trunk/test/org/ap
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/163 Buildbot URL: http://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] 1696508 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1696404 - /tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
2015-08-18 15:39 GMT+03:00 Mark Thomas :
> On 18/08/2015 12:58, Konstantin Kolinko wrote:
>> 2015-08-18 14:44 GMT+03:00 :
>>> Author: markt
>>> Date: Tue Aug 18 11:44:43 2015
>>> New Revision: 1696404
>>>
>>> URL: http://svn.apache.org/r1696404
>>> Log:
>>> Remove unused code
>>>
>>> Modified:
>>>
>>> tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java
>>>
[...]
>>>
>>>
>>> @@ -203,8 +188,7 @@ public final class DrawMessage {
>>>
>>> return type + "," + (colorR & 0xFF) + "," + (colorG & 0xFF) + ","
>>> + (colorB & 0xFF) + "," + (colorA & 0xFF) + "," + thickness
>>> -+ "," + x1 + "," + y1 + "," + x2 + "," + y2 + ","
>>> -+ (lastInChain ? "1" : "0");
>>> ++ "," + x1 + "," + y1 + "," + x2 + "," + y2;
>>> }
>>>
>>> public static DrawMessage parseFromString(String str)
>>> @@ -214,7 +198,6 @@ public final class DrawMessage {
>>> byte[] colors = new byte[4];
>>> double thickness;
>>> double[] coords = new double[4];
>>> -boolean last;
>>>
>>> try {
>>> String[] elements = str.split(",");
>>> @@ -238,15 +221,13 @@ public final class DrawMessage {
>>> + coords[i]);
>>> }
>>>
>>> -last = !"0".equals(elements[10]);
>>> -
>>
>> I think the above condition can have either value. It is not always
>> false. As such, I think removing the "last" flag below is wrong.
>>
>> You can remove getter/setter in DrawMessage, but DrawMessage
>> constructor argument (as passed below) is used.
>>
>> The value of that property is used (directly, without calling a
>> getter) in the following fragment above:
>
> It is only ever used to construct the wire representation from a
> DrawMessage and when constructing a DrawMessage from the wire
> representation.
>
> I don't see it being used outside of those two uses so I see no
> requirement to keep it.
>
1. It is used at client side (by javascript code), and that javascript
code has not been updated.
It must be aligned with java.
2. At the same time you are right in your diagnosis and I do not see
that value being used when performing actual drawing in javascript
code. It is when serializing / deserializing, but I do not see any
other use.
\webapps\examples\websocket\drawboard.xhtml
Line 378 is event handling function:
[[[
// Handles an incoming Websocket message.
var handleOnMessage = function(message) {
]]]
skipping to line 478 there is the branch that processes the DrawMessage
[[[
} else if (type == "1") {
// We received a new DrawMessage.
var maxLastHandledId = -1;
var drawMessages =
msg.substring(1).split("|");
for (var i = 0; i <
drawMessages.length; i++) {
var elements =
drawMessages[i].split(",");
var lastHandledId =
parseInt(elements[0]);
maxLastHandledId =
Math.max(maxLastHandledId,
lastHandledId);
var path = new Path(
parseInt(elements[1]),
[parseInt(elements[2]),
parseInt(elements[3]),
parseInt(elements[4]),
parseInt(elements[5]) / 255.0],
parseFloat(elements[6]),
parseFloat(elements[7]),
parseFloat(elements[8]),
parseFloat(elements[9]),
parseFloat(elements[10]),
elements[11] != "0");
// Draw the path onto the
last canvas.
path.draw(canvasServerImageCtx);
}
]]]
The "elements[11] != "0"" line matches the "lastInChain" flag in java code.
The Path class is starting with line 270.
It has "lastInChain" property that is not used by its draw() method,
.but is used when serializing the message (function pushPath(path) -
line 798)
Best regards,
Konstantin Kolinko
>
>
-+ "," + x1 + "," + y1 + "," + x2 + "," + y2 + ","
-+ (lastInChain ? "1" : "0");
++ "," + x1 + "," + y1 + "," + x2 + "," + y2;
>>
>>
>>> } catch (RuntimeException ex) {
>>> throw new ParseException(ex
Re: What API does the Tomcat DataSource Connection thread pool use to know a connection can be reused?
Christopher, On 8/18/15, 1:13 PM, "Christopher Schultz" wrote: >Did you return the first one before requesting a second one? Not when I was reproducing the hang. I am in the real code. >I'm concerned about your lack of understanding of the way a connection >pool works and inability to debug it sufficiently before asking in this >forum, if you are to be implementing a JDBC driver. :/ We all have to start somewhere. It¹s working now, thanks for the help! Sincerely, Philip Wernersbach Software Engineer Ingram Content - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
