svn commit: r1710574 - in /tomcat/tc8.0.x/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

[kkolinko]

Author: kkolinko
Date: Mon Oct 26 11:38:57 2015
New Revision: 1710574

URL: http://svn.apache.org/viewvc?rev=1710574=rev
Log:
Fix broken test.
Merged r1710571 from tomcat/trunk.

Class.getDeclaredConstructors() is documented to return them in an arbitrary 
order, so asking for 2nd element in that array is wrong.
It failed when running this test in Tomcat 7 with JDK 6u45
java.lang.IllegalArgumentException: wrong number of arguments
  at java.lang.reflect.Constructor.newInstance(Constructor.java:513)
  at 
org.apache.tomcat.jdbc.test.TestSlowQueryComparator.createComparator(TestSlowQueryComparator.java:134)

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

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 11:38:57 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,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,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,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,168577
 

svn commit: r1710577 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

[kkolinko]

Author: kkolinko
Date: Mon Oct 26 11:44:06 2015
New Revision: 1710577

URL: http://svn.apache.org/viewvc?rev=1710577=rev
Log:
Mark helper method as static.

Modified:

tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=1710577=1710576=1710577=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
 Mon Oct 26 11:44:06 2015
@@ -483,7 +483,7 @@ public class SlowQueryReport extends Abs
 handleZero(stats2.lastInvocation));
 }
 
-private long handleZero(long value) {
+private static long handleZero(long value) {
 return value == 0 ? Long.MAX_VALUE : value;
 }
 



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

svn commit: r1710576 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

[kkolinko]

Author: kkolinko
Date: Mon Oct 26 11:41:42 2015
New Revision: 1710576

URL: http://svn.apache.org/viewvc?rev=1710576=rev
Log:
Fix broken test.
Merged r1710574 from tomcat/tc8.0.x/trunk.

Class.getDeclaredConstructors() is documented to return them in an arbitrary 
order, so asking for 2nd element in that array is wrong.
It failed when running this test in Tomcat 7 with JDK 6u45
java.lang.IllegalArgumentException: wrong number of arguments
  at java.lang.reflect.Constructor.newInstance(Constructor.java:513)
  at 
org.apache.tomcat.jdbc.test.TestSlowQueryComparator.createComparator(TestSlowQueryComparator.java:134)

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

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 11:41:42 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,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490
-/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
 

svn commit: r1710519 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/ExtendedAccessLogValve.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Oct 26 07:39:17 2015
New Revision: 1710519

URL: http://svn.apache.org/viewvc?rev=1710519=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58537
Merged revision 1710517 from tomcat/trunk:
ExtendedAccessLogValve inner AccessLogElement classes are made static. Patch 
provided by Anthony Whitford.

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 07:39:17 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,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,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,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,168577
 

Re: CSRF prevention filter for REST

[Violeta Georgieva]

Hi,

2015-10-14 21:39 GMT+03:00 Violeta Georgieva :
>
> Hi,
>
> I would like to provide such a filter as part of the default Tomcat
filters [1].
> My plan is to extract the common functionality from the current
CsrfPreventionFIlter in a base class and then to use this functionality in
both CsrfPreventionFilter and the new filter which will be for REST.
> I will provide the functionality in trunk so that you will be able to
review it and give me a feedback.

I plan to back-port this feature in Tomcat 7/8.

Regards,
Violeta
>
> [1] http://marc.info/?t=13482586931=1=2

svn commit: r1710571 - /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

[kkolinko]

Author: kkolinko
Date: Mon Oct 26 11:27:06 2015
New Revision: 1710571

URL: http://svn.apache.org/viewvc?rev=1710571=rev
Log:
Fix broken test.

Class.getDeclaredConstructors() is documented to return them in an arbitrary 
order, so asking for 2nd element in that array is wrong.
It failed when running this test in Tomcat 7 with JDK 6u45
java.lang.IllegalArgumentException: wrong number of arguments
  at java.lang.reflect.Constructor.newInstance(Constructor.java:513)
  at 
org.apache.tomcat.jdbc.test.TestSlowQueryComparator.createComparator(TestSlowQueryComparator.java:134)

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java?rev=1710571=1710570=1710571=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
 Mon Oct 26 11:27:06 2015
@@ -32,9 +32,7 @@ import org.apache.tomcat.jdbc.pool.inter
 public class TestSlowQueryComparator {
 
 @Test
-public void testBug58489() throws ClassNotFoundException,
-InstantiationException, IllegalAccessException,
-InvocationTargetException {
+public void testBug58489() throws Exception {
 
 long[] testData = { 0, 0, 0, 1444225382010l, 0, 1444225382011l, 0,
 1444225382012l, 0, 1444225382056l, 0, 1444225382014l, 0,
@@ -61,20 +59,14 @@ public class TestSlowQueryComparator {
 }
 
 @Test
-public void testEqualQueryStatsWithNoLastInvocation()
-throws ClassNotFoundException, InstantiationException,
-IllegalAccessException, IllegalArgumentException,
-InvocationTargetException {
+public void testEqualQueryStatsWithNoLastInvocation() throws Exception {
 Comparator queryStatsComparator = createComparator();
 QueryStats q1 = new QueryStats("abc");
 Assert.assertEquals(0, queryStatsComparator.compare(q1, q1));
 }
 
 @Test
-public void testEqualQueryStatsWithLastInvocation()
-throws ClassNotFoundException, InstantiationException,
-IllegalAccessException, IllegalArgumentException,
-InvocationTargetException {
+public void testEqualQueryStatsWithLastInvocation() throws Exception {
 Comparator queryStatsComparator = createComparator();
 QueryStats q1 = new QueryStats("abc");
 q1.add(0, 100);
@@ -82,10 +74,7 @@ public class TestSlowQueryComparator {
 }
 
 @Test
-public void testQueryStatsOneWithLastInvocation()
-throws ClassNotFoundException, InstantiationException,
-IllegalAccessException, IllegalArgumentException,
-InvocationTargetException {
+public void testQueryStatsOneWithLastInvocation() throws Exception {
 Comparator queryStatsComparator = createComparator();
 QueryStats q1 = new QueryStats("abc");
 QueryStats q2 = new QueryStats("def");
@@ -95,10 +84,7 @@ public class TestSlowQueryComparator {
 }
 
 @Test
-public void testQueryStatsBothWithSameLastInvocation()
-throws ClassNotFoundException, InstantiationException,
-IllegalAccessException, IllegalArgumentException,
-InvocationTargetException {
+public void testQueryStatsBothWithSameLastInvocation() throws Exception {
 Comparator queryStatsComparator = createComparator();
 QueryStats q1 = new QueryStats("abc");
 QueryStats q2 = new QueryStats("def");
@@ -109,10 +95,7 @@ public class TestSlowQueryComparator {
 }
 
 @Test
-public void testQueryStatsBothWithSomeLastInvocation()
-throws ClassNotFoundException, InstantiationException,
-IllegalAccessException, IllegalArgumentException,
-InvocationTargetException {
+public void testQueryStatsBothWithSomeLastInvocation() throws Exception {
 Comparator queryStatsComparator = createComparator();
 QueryStats q1 = new QueryStats("abc");
 QueryStats q2 = new QueryStats("abc");
@@ -124,11 +107,12 @@ public class TestSlowQueryComparator {
 
 private Comparator createComparator()
 throws ClassNotFoundException, InstantiationException,
-IllegalAccessException, InvocationTargetException {
+IllegalAccessException, InvocationTargetException,
+SecurityException, NoSuchMethodException {
 Class comparatorClass = Class
 
.forName("org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport$QueryStatsComparator");
 Constructor 

svn commit: r1710578 - in /tomcat/tc8.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

[kkolinko]

Author: kkolinko
Date: Mon Oct 26 11:45:32 2015
New Revision: 1710578

URL: http://svn.apache.org/viewvc?rev=1710578=rev
Log:
Mark helper method as static.
Merged r1710577 from tomcat/trunk.

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

tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 11:45:32 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,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,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,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,168577
 

[Bug 58540] Request setCharacterEncoding has unused code

[bugzilla]

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

--- Comment #2 from Konstantin Kolinko  ---
(In reply to Anthony Whitford from comment #0)
> The 'buffer' variable is unused and can be removed.  (I suspect it is a
> remnant of some past code.) 

Thanks for noting.

As a historic reference: the code that used those variables was removed in
r1140463 in a followup to r1138019 (bug 51400).

-- 
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 propchange: r1710523 - svn:log

[kkolinko]

Author: kkolinko
Revision: 1710523
Modified property: svn:log

Modified: svn:log at Mon Oct 26 09:32:50 2015
--
--- svn:log (original)
+++ svn:log Mon Oct 26 09:32:50 2015
@@ -1 +1,2 @@
+Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58540
 Remove unused code. Patch provided by Anthony Whitford.


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

svn commit: r1710580 - in /tomcat/tc7.0.x/trunk: ./ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

[kkolinko]

Author: kkolinko
Date: Mon Oct 26 11:57:04 2015
New Revision: 1710580

URL: http://svn.apache.org/viewvc?rev=1710580=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58489
Simplify implementation to avoid unnecessary boxing/unboxing and align with 
Tomcat 8.
Backport of r1710578 from tomcat/tc8.0.x/trunk.

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

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 11:57:04 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,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574
-/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
 

svn commit: r1710518 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Oct 26 07:33:27 2015
New Revision: 1710518

URL: http://svn.apache.org/viewvc?rev=1710518=rev
Log:
rev 1710447
Remove some extra bits in the changelog that are obsolete.

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=1710518=1710517=1710518=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Oct 26 07:33:27 2015
@@ -76,11 +76,6 @@
 error conditions due to trying to call initCause() on a
 ClassNotFoundException which is not permitted. (markt)
   
- https://bz.apache.org/bugzilla/show_bug.cgi?id=58518
-Fix a regression in BZ 56777 (that added support for URIs in config file
-locations)
-File paths on Windows could previously be specified with \ or / as the
-separator. BZ 56777 broke that. This commit restores that behaviour.
 
   
   



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

svn commit: r1710524 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/Request.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Oct 26 08:10:54 2015
New Revision: 1710524

URL: http://svn.apache.org/viewvc?rev=1710524=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58540
Merged revision 1710523 from tomcat/trunk:
Remove unused code. Patch provided by Anthony Whitford.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 08:10:54 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,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,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,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,168577
 

[Bug 58537] ExtendedAccessLogValve inner AccessLogElement classes can be static

[bugzilla]

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

Violeta Georgieva  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Violeta Georgieva  ---
Hi,

Thanks for the report and the patch.
The fix is available in trunk, 8.0.x (for 8.0.29 onwards) and 7.0.x (for 7.0.66
onwards)

Regards,
Violeta

-- 
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: r1710523 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java

[violetagg]

Author: violetagg
Date: Mon Oct 26 08:06:54 2015
New Revision: 1710523

URL: http://svn.apache.org/viewvc?rev=1710523=rev
Log:
Remove unused code. Patch provided by Anthony Whitford.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1710523=1710522=1710523=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Mon Oct 26 
08:06:54 2015
@@ -1536,10 +1536,6 @@ public class Request implements HttpServ
 return;
 }
 
-// Ensure that the specified encoding is valid
-byte buffer[] = new byte[1];
-buffer[0] = (byte) 'a';
-
 // Confirm that the encoding name is valid
 B2CConverter.getCharset(enc);
 



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

svn commit: r1710526 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/Request.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Oct 26 08:13:06 2015
New Revision: 1710526

URL: http://svn.apache.org/viewvc?rev=1710526=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58540
Merged revision 1710523 from tomcat/trunk:
Remove unused code. Patch provided by Anthony Whitford.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 08:13:06 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,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490
-/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
 

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

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

That said, some information snippets are provided here.

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



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

[Bug 58540] Request setCharacterEncoding has unused code

[bugzilla]

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

Violeta Georgieva  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Violeta Georgieva  ---
Hi,

Thanks for the report and the patch.
The fix is available in trunk, 8.0.x (for 8.0.29 onwards) and 7.0.x (for 7.0.66
onwards)

Regards,
Violeta

-- 
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: r1710517 - /tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java

[violetagg]

Author: violetagg
Date: Mon Oct 26 07:22:55 2015
New Revision: 1710517

URL: http://svn.apache.org/viewvc?rev=1710517=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58537
ExtendedAccessLogValve inner AccessLogElement classes are made static. Patch 
provided by Anthony Whitford.

Modified:
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=1710517=1710516=1710517=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java 
Mon Oct 26 07:22:55 2015
@@ -258,7 +258,7 @@ public class ExtendedAccessLogValve exte
 }
 }
 
-protected class RequestHeaderElement implements AccessLogElement {
+protected static class RequestHeaderElement implements AccessLogElement {
 private final String header;
 
 public RequestHeaderElement(String header) {
@@ -271,7 +271,7 @@ public class ExtendedAccessLogValve exte
 }
 }
 
-protected class ResponseHeaderElement implements AccessLogElement {
+protected static class ResponseHeaderElement implements AccessLogElement {
 private final String header;
 
 public ResponseHeaderElement(String header) {
@@ -285,7 +285,7 @@ public class ExtendedAccessLogValve exte
 }
 }
 
-protected class ServletContextElement implements AccessLogElement {
+protected static class ServletContextElement implements AccessLogElement {
 private final String attribute;
 
 public ServletContextElement(String attribute) {
@@ -299,7 +299,7 @@ public class ExtendedAccessLogValve exte
 }
 }
 
-protected class CookieElement implements AccessLogElement {
+protected static class CookieElement implements AccessLogElement {
 private final String name;
 
 public CookieElement(String name) {
@@ -320,7 +320,7 @@ public class ExtendedAccessLogValve exte
 /**
  * write a specific response header - x-O(xxx)
  */
-protected class ResponseAllHeaderElement implements AccessLogElement {
+protected static class ResponseAllHeaderElement implements 
AccessLogElement {
 private final String header;
 
 public ResponseAllHeaderElement(String header) {
@@ -351,7 +351,7 @@ public class ExtendedAccessLogValve exte
 }
 }
 
-protected class RequestAttributeElement implements AccessLogElement {
+protected static class RequestAttributeElement implements AccessLogElement 
{
 private final String attribute;
 
 public RequestAttributeElement(String attribute) {
@@ -365,7 +365,7 @@ public class ExtendedAccessLogValve exte
 }
 }
 
-protected class SessionAttributeElement implements AccessLogElement {
+protected static class SessionAttributeElement implements AccessLogElement 
{
 private final String attribute;
 
 public SessionAttributeElement(String attribute) {
@@ -384,7 +384,7 @@ public class ExtendedAccessLogValve exte
 }
 }
 
-protected class RequestParameterElement implements AccessLogElement {
+protected static class RequestParameterElement implements AccessLogElement 
{
 private final String parameter;
 
 public RequestParameterElement(String parameter) {



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

[Bug 56777] Allow configuration resources to be loaded from places other than straight off the filesystem

[bugzilla]

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

--- Comment #14 from Huxing Zhang  ---
Created attachment 33220
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33220=edit
patch that also avoid bug 58518

Well, since Mark has already fixed bug 58518, I have also back ported this fix
into tomcat 7.0.x.
Please refer to the patches I provided.
In addition, I have also added a unit test case to cover bug 58518.

-- 
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 58546] SecureNio2Channel inner class GatherState should be static

[bugzilla]

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

Violeta Georgieva  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Violeta Georgieva  ---
Hi,

Thanks for the report and the patch.
The fix is available in 8.0.x for 8.0.29 onwards

Regards,
Violeta

-- 
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: r1710520 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ExtendedAccessLogValve.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Oct 26 07:41:49 2015
New Revision: 1710520

URL: http://svn.apache.org/viewvc?rev=1710520=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58537
Merged revision 1710517 from tomcat/trunk:
ExtendedAccessLogValve inner AccessLogElement classes are made static. Patch 
provided by Anthony Whitford.

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 07:41:49 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,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490
-/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
 

svn commit: r1710529 - in /tomcat/tc8.0.x/trunk: java/org/apache/tomcat/util/net/SecureNio2Channel.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Oct 26 08:24:16 2015
New Revision: 1710529

URL: http://svn.apache.org/viewvc?rev=1710529=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58546
SecureNio2Channel inner class GatherState is made static. Patch provided by 
Anthony Whitford.

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1710529=1710528=1710529=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
Mon Oct 26 08:24:16 2015
@@ -858,7 +858,7 @@ public class SecureNio2Channel extends N
 }
 }
 
-private class GatherState {
+private static class GatherState {
 public ByteBuffer[] srcs;
 public int offset;
 public int length;

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=1710529=1710528=1710529=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Oct 26 08:24:16 2015
@@ -77,8 +77,10 @@
 ClassNotFoundException which is not permitted. (markt)
   
   
-58537: Some of the inner classes in
-o.a.catalina.valves.ExtendedAccessLogValve are made 
static.
+58537, 58546: Some of the inner classes in
+o.a.catalina.valves.ExtendedAccessLogValve
+and o.a.tomcat.util.net.SecureNio2Channel
+are made static.
 Patch provided by Anthony Whitford. (violetagg)
   
   



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

[Bug 56777] Allow configuration resources to be loaded from places other than straight off the filesystem

[bugzilla]

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

--- Comment #15 from Violeta Georgieva  ---
(In reply to Huxing Zhang from comment #14)
> Created attachment 33220 [details]
> patch that also avoid bug 58518
> 
> Well, since Mark has already fixed bug 58518, I have also back ported this
> fix into tomcat 7.0.x.

Please check the following discussion
http://marc.info/?t=14457805251=1=2

-- 
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 propchange: r1710689 - svn:log

[violetagg]

Author: violetagg
Revision: 1710689
Modified property: svn:log

Modified: svn:log at Mon Oct 26 20:46:06 2015
--
--- svn:log (original)
+++ svn:log Mon Oct 26 20:46:06 2015
@@ -1,2 +1,2 @@
-Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58544,58541
+Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58544 58541
 Use Integer.toString(int) instead of Integer.valueOf(int).toString() when only 
a string representation of a primitive is needed. Based on a patch provided by 
Anthony Whitford.


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

[Bug 58486] JreMemoryLeakPreventionListener: initialize two further JRE classes

[bugzilla]

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

--- Comment #4 from Luke Woodward  ---
(In reply to Konstantin Kolinko from comment #3)
> I raised this issue with Apache Xerces,
> https://issues.apache.org/jira/browse/XERCESJ-1667
> 
> 
> (In reply to Luke Woodward from comment #0)
> > 
> > I have filed a bug report with Oracle to change the behaviour of these two
> > classes.  However, until this gets fixed (if it gets fixed at all), it would
> > be appreciated if the JreMemoryLeakPreventionListener could be adapted to
> > handle these two classes.
> 
> Do you have a bug number for your report?

No, I don't.  I have a Review ID, JI-9025281, but that's all I've heard from
Oracle so far.

-- 
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

buildbot success in ASF Buildbot on tomcat-8-trunk

[buildbot]

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/202

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] 1710679
Blamelist: violetagg

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: r1710699 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/RequestDumperFilter.java java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Oct 26 21:07:03 2015
New Revision: 1710699

URL: http://svn.apache.org/viewvc?rev=1710699=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58541 58544
Merged revision 1710689 from tomcat/trunk:
Use Integer.toString(int) instead of Integer.valueOf(int).toString() when only 
a string representation of a primitive is needed. Based on a patch provided by 
Anthony Whitford.

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 21:07:03 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,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578
-/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
 

Re: svn commit: r1710618 - in /tomcat/trunk/java/org/apache/tomcat/util/net: SecureNio2Channel.java openssl/OpenSSLEngine.java

[Mark Thomas]

On 26/10/2015 08:10, r...@apache.org wrote:
> Author: remm
> Date: Mon Oct 26 15:10:53 2015
> New Revision: 1710618
> 
> URL: http://svn.apache.org/viewvc?rev=1710618=rev
> Log:
> - Fix capacity check algorithm (overflow isn't the right result in that case).
> - Unwrap first in NIO2 and wait for an explicit underflow to read on the 
> socket (I'll test adding a flag to optimize this since this is likely a bit 
> expensive, but commit it for now since everything's now working).

Just to clarify, do you mean that all the various issues you were
observing with NIO and NIO2 with the OpenSSL engine with and without h2
are now resolved? If so, WOOT!

Mark

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

Re: [VOTE] Release Apache Tomcat Native 1.2.0

[Mark Thomas]

Ping.

Currently this release only has two votes. 9.0.x requires a 1.2.x
tcnative so this is currently blocking any work on a 9.0.0.RC1 release.

Additional testing and votes would be very welcome.

Thanks in advance,

Mark


On 22/10/2015 07:22, Rémy Maucherat wrote:
> 2015-10-22 12:47 GMT+02:00 Mark Thomas :
> 
>> Version 1.2.0 includes the following changes:
>> - Windows binaries built with APR 1.5.1 and OpenSSL 1.0.2d
>> - ALPN support
>>
> (most importantly IMO) - Add API methods to access OpenSSL BIO
> 
>>
>> The proposed release artefacts can be found at [1],
>> and the build was done using tag [2].
>>
>> The Apache Tomcat Native 1.2.0 is
>>  [X] Stable, go ahead and release
>>  [ ] Broken because of ...
>>
>>
>>  [1]
>>
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.0/
>>  [2]
>> https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_0
>>
>> So I guess I've been testing the OpenSSL engine for a while, and I didn't
> run into issues. ALPN works as well [APR and NIOx] with HTTP/2. So IMO this
> is quite ambitious, but maybe "stable" can be tried since most of the "new"
> code is actually only a merge from code released elsewhere.
> 
> Rémy
> 


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

svn commit: r1710679 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/xmlparser/XMLEncodingDetector.java java/org/apache/tomcat/util/net/AprEndpoint.java

[violetagg]

Author: violetagg
Date: Mon Oct 26 19:07:33 2015
New Revision: 1710679

URL: http://svn.apache.org/viewvc?rev=1710679=rev
Log:
Merged revision 1710676 from tomcat/trunk:
Some of the inner classes are made static.

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

tomcat/tc8.0.x/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 19:07:33 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,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,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,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,168577
 

Re: svn commit: r1710618 - in /tomcat/trunk/java/org/apache/tomcat/util/net: SecureNio2Channel.java openssl/OpenSSLEngine.java

[Rémy Maucherat]

2015-10-26 20:50 GMT+01:00 Mark Thomas :

> On 26/10/2015 08:10, r...@apache.org wrote:
> > Author: remm
> > Date: Mon Oct 26 15:10:53 2015
> > New Revision: 1710618
> >
> > URL: http://svn.apache.org/viewvc?rev=1710618=rev
> > Log:
> > - Fix capacity check algorithm (overflow isn't the right result in that
> case).
> > - Unwrap first in NIO2 and wait for an explicit underflow to read on the
> socket (I'll test adding a flag to optimize this since this is likely a bit
> expensive, but commit it for now since everything's now working).
>
> Just to clarify, do you mean that all the various issues you were
> observing with NIO and NIO2 with the OpenSSL engine with and without h2
> are now resolved? If so, WOOT!
>
> It looks good for me with Chrome and HTTP/2. I can't say if everything is
fine yet, but it's likely. The behavior you found is listed as a known bug
in OpenSSL's API, unfortunately the native code didn't work around it. So
at least the engine has to do it since the behavior is obviously not
consistent with JSSE's engine.

NIO and its non blocking reads behaved better in most cases, it would read
0 and proceed with unwrapping (again), while NIO2 would not unwrap again
until it got more data [which isn't bad by itself, but this doesn't work
due to the OpenSSL's bug].

Rémy

svn commit: r1710682 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/naming/resources/EmptyDirContext.java java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/websocket/WsRemoteEndp

[violetagg]

Author: violetagg
Date: Mon Oct 26 19:19:49 2015
New Revision: 1710682

URL: http://svn.apache.org/viewvc?rev=1710682=rev
Log:
Merged revision 1710676 from tomcat/trunk:
Some of the inner classes are made static.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/EmptyDirContext.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 19:19:49 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,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578
-/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
 

[Bug 58554] New: Cannot output html from jsp files inside of lambdas

[bugzilla]

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

Bug ID: 58554
   Summary: Cannot output html from jsp files inside of lambdas
   Product: Tomcat 8
   Version: 8.0.26
  Hardware: PC
OS: Windows NT
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: joseph.len...@askattest.com

If you use a within a JSP file, and you output html within that lambda, then
you receive a compile error.

This is because the HTML is outputted using a variable 'out' which is not
final. So the 'out' variable in the generated JSP code needs to be changed to
be final.

i.e.

<%
// stuff like this fails to compile
blog.eachPost( (title, content) -> { %>
<%= title %>
<%= content %>
%> });
%>

It would be useful if lambdas could work in JSP files.

-- 
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: r1710689 - in /tomcat/trunk/java/org/apache/catalina: filters/RequestDumperFilter.java servlets/CGIServlet.java

[violetagg]

Author: violetagg
Date: Mon Oct 26 20:39:29 2015
New Revision: 1710689

URL: http://svn.apache.org/viewvc?rev=1710689=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58544,58541
Use Integer.toString(int) instead of Integer.valueOf(int).toString() when only 
a string representation of a primitive is needed. Based on a patch provided by 
Anthony Whitford.

Modified:
tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=1710689=1710688=1710689=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java Mon 
Oct 26 20:39:29 2015
@@ -109,7 +109,7 @@ public class RequestDumperFilter extends
 
 doLog(" characterEncoding", request.getCharacterEncoding());
 doLog(" contentLength",
-Integer.valueOf(request.getContentLength()).toString());
+Integer.toString(request.getContentLength()));
 doLog("   contentType", request.getContentType());
 
 if (hRequest == null) {
@@ -187,7 +187,7 @@ public class RequestDumperFilter extends
 doLog("scheme", request.getScheme());
 doLog("serverName", request.getServerName());
 doLog("serverPort",
-Integer.valueOf(request.getServerPort()).toString());
+Integer.toString(request.getServerPort()));
 
 if (hRequest == null) {
 doLog("   servletPath", NON_HTTP_REQ_MSG);
@@ -236,7 +236,7 @@ public class RequestDumperFilter extends
 doLog("remoteUser", NON_HTTP_RES_MSG);
 } else {
 doLog("status",
-Integer.valueOf(hResponse.getStatus()).toString());
+Integer.toString(hResponse.getStatus()));
 }
 
 doLog("END TIME  ", getTimestamp());

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1710689=1710688=1710689=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Mon Oct 26 
20:39:29 2015
@@ -1080,7 +1080,7 @@ public final class CGIServlet extends Ht
  */
 int contentLength = req.getContentLength();
 String sContentLength = (contentLength <= 0 ? "" :
-(Integer.valueOf(contentLength)).toString());
+Integer.toString(contentLength));
 envp.put("CONTENT_LENGTH", sContentLength);
 
 



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

svn commit: r1710697 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/RequestDumperFilter.java java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Mon Oct 26 20:59:23 2015
New Revision: 1710697

URL: http://svn.apache.org/viewvc?rev=1710697=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58541 58544
Merged revision 1710689 from tomcat/trunk:
Use Integer.toString(int) instead of Integer.valueOf(int).toString() when only 
a string representation of a primitive is needed. Based on a patch provided by 
Anthony Whitford.

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 20:59:23 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,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,1
 
37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,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,168577
 

[Bug 58544] RequestDumperFilter contentLength inefficiently creating Integer

[bugzilla]

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

Violeta Georgieva  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Violeta Georgieva  ---
Hi,

Thanks for the report and the patch.
I applied the same fix on other places in the code also.
The fix is available in trunk, 8.0.x (for 8.0.29 onwards) and 7.0.x (for 7.0.66
onwards)

Regards,
Violeta

-- 
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: [ANN] New committer: Martin Grigorov

[Keiichi Fujino]

2015-10-26 23:35 GMT+09:00 Mark Thomas :

> On behalf of the Tomcat committers I am pleased to announce that
> Martin Grigorov (mgrigorov) has been voted in as a new Tomcat committer.
>
> Please join me in welcoming him.
>
>

Welcome!



> Regards,
>
> Mark
>
> -
> To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: users-h...@tomcat.apache.org
>
> --
> Keiichi.Fujino
> 

[Bug 56148] support (multiple) ocsp stapling

[bugzilla]

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

Ralf Hauser  changed:

   What|Removed |Added

 CC||hau...@acm.org

--- Comment #2 from Ralf Hauser  ---
see also
https://community.letsencrypt.org/t/ocsp-uri-http-ocsp-comodoca-com-why-not-https/2135

-- 
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: r1710676 - in /tomcat/trunk/java/org/apache: jasper/xmlparser/XMLEncodingDetector.java tomcat/util/net/AprEndpoint.java tomcat/util/net/Nio2Endpoint.java

[violetagg]

Author: violetagg
Date: Mon Oct 26 18:54:07 2015
New Revision: 1710676

URL: http://svn.apache.org/viewvc?rev=1710676=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58537
Some of the inner classes are made static.

Modified:
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1710676=1710675=1710676=diff
==
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Mon 
Oct 26 18:54:07 2015
@@ -1013,7 +1013,7 @@ public class XMLEncodingDetector {
  * @author Neil Graham, IBM
  * @author Glenn Marcy, IBM
  */
-private final class RewindableInputStream extends InputStream {
+private static final class RewindableInputStream extends InputStream {
 
 private InputStream fInputStream;
 private byte[] fData;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1710676=1710675=1710676=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Oct 26 
18:54:07 2015
@@ -1054,7 +1054,7 @@ public class AprEndpoint extends Abstrac
 
 // -- SocketTimeouts Inner 
Class
 
-public class SocketTimeouts {
+public static class SocketTimeouts {
 protected int size;
 
 protected long[] sockets;
@@ -1115,7 +1115,7 @@ public class AprEndpoint extends Abstrac
 
 // -- SocketList Inner 
Class
 
-public class SocketList {
+public static class SocketList {
 protected volatile int size;
 protected int pos;
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1710676=1710675=1710676=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Oct 26 
18:54:07 2015
@@ -957,7 +957,7 @@ public class Nio2Endpoint extends Abstra
 /**
  * Internal state tracker for scatter/gather operations.
  */
-private class OperationState {
+private static class OperationState {
 private final ByteBuffer[] buffers;
 private final int offset;
 private final int length;



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

svn propchange: r1710676 - svn:log

[violetagg]

Author: violetagg
Revision: 1710676
Modified property: svn:log

Modified: svn:log at Mon Oct 26 18:55:34 2015
--
--- svn:log (original)
+++ svn:log Mon Oct 26 18:55:34 2015
@@ -1,2 +1 @@
-Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58537
 Some of the inner classes are made static.


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

Re: [ANN] New committer: Martin Grigorov

[Rainer Jung]

Hi Martin,

Am 26.10.2015 um 15:35 schrieb Mark Thomas:

On behalf of the Tomcat committers I am pleased to announce that
Martin Grigorov (mgrigorov) has been voted in as a new Tomcat committer.

Please join me in welcoming him.


Long time no hear. Nice having you around here!

Regards,

Rainer


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

svn commit: r1710608 - in /tomcat/trunk/java/org/apache/tomcat/util/net: SecureNio2Channel.java openssl/OpenSSLEngine.java

[remm]

Author: remm
Date: Mon Oct 26 14:33:49 2015
New Revision: 1710608

URL: http://svn.apache.org/viewvc?rev=1710608=rev
Log:
- Remove unwrap loop (that would have to be replicated across all unwrap codes 
in NIO and NIO2; I did still get some amount of timeouts in my testing - since 
the fix only covered non blocking unwrap, not the blocking unwrap).
- Fix the engine unwrap code to take into account that it is not possible to 
know if there's some plaintext to read unless trying it (this is what the 
"priming" read is about, but it needs to be repeated).
- Thanks to Mark for his most excellent debugging. No thanks to OpenSSL for the 
funny behavior.
- Testing is almost fine now with NIOx except I get an overflow with the byte 
counter, and the unwrap/read code doesn't handle overflows at all. Increasing 
the socket input buffer avoids this, although it is already at application 
buffer size, which is supposed to be enough. Will investigate to determine the 
best solution.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1710608=1710607=1710608=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Mon Oct 
26 14:33:49 2015
@@ -824,16 +824,7 @@ public class SecureNio2Channel extends N
 throw new 
IOException(sm.getString("channel.nio.ssl.unwrapFail", unwrap.getStatus()));
 }
 // continue to unwrap as long as the input buffer has 
stuff
-// TODO: unwrap appears only to unwrap one TLS record 
at
-//   a time even if there are multiple TLS records
-//   in the input buffer. Therefore multiple calls
-//   to unwrap are required to ensure that all TLS
-//   records are decrypted and written to dst.
-//   This may be a bug in tc-native or something
-//   that is better handled at that level. For now
-//   the '|| unwrap.getStatus() == Status.OK' is a
-//   workaround.
-} while ((netInBuffer.position() != 0) || 
unwrap.getStatus() == Status.OK);
+} while (netInBuffer.position() != 0);
 // If everything is OK, so complete
 handler.completed(Integer.valueOf(read), attach);
 } catch (Exception e) {

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1710608=1710607=1710608=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Mon 
Oct 26 14:33:49 2015
@@ -559,23 +559,7 @@ public final class OpenSSLEngine extends
 throw new SSLException(e);
 }
 if (bytesConsumed >= 0) {
-int lastPrimingReadResult = SSL.readFromSSL(ssl, EMPTY_ADDR, 0); 
// priming read
-// check if SSL_read returned <= 0. In this case we need to check 
the error and see if it was something
-// fatal.
-if (lastPrimingReadResult <= 0) {
-// Check for OpenSSL errors caused by the priming read
-long error = SSL.getLastErrorNumber();
-if (error != SSL.SSL_ERROR_NONE) {
-String err = SSL.getErrorString(error);
-if (logger.isDebugEnabled()) {
-logger.debug(sm.getString("engine.readFromSSLFailed", 
Long.toString(error),
-Integer.toString(lastPrimingReadResult), err));
-}
-// There was an internal error -- shutdown
-shutdown();
-throw new SSLException(err);
-}
-}
+primingSSLRead();
 } else {
 // Reset to 0 as -1 is used to signal that nothing was written and 
no priming read needs to be done
 bytesConsumed = 0;
@@ -586,15 +570,15 @@ public final class OpenSSLEngine extends
 // We first check handshakeFinished to eliminate the overhead of extra 
JNI call if possible.
 int pendingApp = (handshakeFinished || SSL.isInInit(ssl) == 0) ? 

svn commit: r1710618 - in /tomcat/trunk/java/org/apache/tomcat/util/net: SecureNio2Channel.java openssl/OpenSSLEngine.java

[remm]

Author: remm
Date: Mon Oct 26 15:10:53 2015
New Revision: 1710618

URL: http://svn.apache.org/viewvc?rev=1710618=rev
Log:
- Fix capacity check algorithm (overflow isn't the right result in that case).
- Unwrap first in NIO2 and wait for an explicit underflow to read on the socket 
(I'll test adding a flag to optimize this since this is likely a bit expensive, 
but commit it for now since everything's now working).

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1710618=1710617=1710618=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Mon Oct 
26 15:10:53 2015
@@ -572,14 +572,9 @@ public class SecureNio2Channel extends N
 
 private class FutureRead implements Future {
 private final ByteBuffer dst;
-private final Future integer;
+private final Future integer = null;
 private FutureRead(ByteBuffer dst) {
 this.dst = dst;
-if (netInBuffer.position() > 0) {
-this.integer = null;
-} else {
-this.integer = sc.read(netInBuffer);
-}
 }
 @Override
 public boolean cancel(boolean mayInterruptIfRunning) {
@@ -837,11 +832,7 @@ public class SecureNio2Channel extends N
 handler.failed(exc, attach);
 }
 };
-if (netInBuffer.position() > 0) {
-
readCompletionHandler.completed(Integer.valueOf(netInBuffer.position()), 
attachment);
-} else {
-sc.read(netInBuffer, timeout, unit, attachment, 
readCompletionHandler);
-}
+
readCompletionHandler.completed(Integer.valueOf(netInBuffer.position()), 
attachment);
 }
 
 @Override

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1710618=1710617=1710618=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Mon 
Oct 26 15:10:53 2015
@@ -571,13 +571,12 @@ public final class OpenSSLEngine extends
 int pendingApp = (handshakeFinished || SSL.isInInit(ssl) == 0) ? 
SSL.pendingReadableBytesInSSL(ssl) : 0;
 int bytesProduced = 0;
 int idx = offset;
+// Do we have enough room in dsts to write decrypted data?
+if (capacity < pendingApp) {
+return new SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, 
getHandshakeStatus(), bytesConsumed, 0);
+}
 
 while (pendingApp > 0) {
-// Do we have enough room in dsts to write decrypted data?
-if (capacity < pendingApp) {
-return new 
SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, getHandshakeStatus(), 
bytesConsumed, 0);
-}
-
 // Write decrypted data to dsts buffers
 while (idx < endOffset) {
 ByteBuffer dst = dsts[idx];
@@ -612,6 +611,8 @@ public final class OpenSSLEngine extends
 if (pendingApp == 0) {
 primingSSLRead();
 pendingApp = SSL.pendingReadableBytesInSSL(ssl);
+} else if (capacity == 0) {
+break;
 }
 }
 



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

[ANN] New committer: Martin Grigorov

[Mark Thomas]

On behalf of the Tomcat committers I am pleased to announce that
Martin Grigorov (mgrigorov) has been voted in as a new Tomcat committer.

Please join me in welcoming him.

Regards,

Mark

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

Re: [ANN] New committer: Martin Grigorov

[Maxim Solodovnik]

Congrats Martin!

On Mon, Oct 26, 2015 at 8:35 PM, Mark Thomas  wrote:

> On behalf of the Tomcat committers I am pleased to announce that
> Martin Grigorov (mgrigorov) has been voted in as a new Tomcat committer.
>
> Please join me in welcoming him.
>
> Regards,
>
> Mark
>
> -
> To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: users-h...@tomcat.apache.org
>
>


-- 
WBR
Maxim aka solomax

[Bug 56777] Allow configuration resources to be loaded from places other than straight off the filesystem

[bugzilla]

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

--- Comment #16 from Huxing Zhang  ---
(In reply to Violeta Georgieva from comment #15)
> (In reply to Huxing Zhang from comment #14)
> > Created attachment 33220 [details]
> > patch that also avoid bug 58518
> > 
> > Well, since Mark has already fixed bug 58518, I have also back ported this
> > fix into tomcat 7.0.x.
> 
> Please check the following discussion
> http://marc.info/?t=14457805251=1=2

Thanks for your information, How about the following implementation
ConfigFileLoader, which I think it can avoid:
1) twice hard disk access.
2) resolving file paths that contains space.

public static InputStream getInputStream(String location) throws IOException {
// Absolute URIs will be left alone
// Relative files will be resolved relative to catalina base
// Absolute files will be converted to URIs

// Location was originally always a file before URI support was added
so
// try file first.

// First guess, an absolute file path
File file = new File(location);

if (!file.isAbsolute()) {
// Second guess, a file path relative to CATALINA_BASE
file = new File(CATALINA_BASE_FILE, location);
}

if (file.isFile()) {
return new FileInputStream(file);
}

// Third and final guess, a URI
URI uri = CATALINA_BASE_URI.resolve(location);
return uri.toURL().openStream();
}

-- 
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: [ANN] New committer: Ognjen Blagojevic

[Christopher Schultz]

All,

On 10/24/15 9:58 AM, Mark Thomas wrote:
> On behalf of the Tomcat committers I am pleased to announce that
> Ognjen Blagojevic (ognjen) has been voted in as a new Tomcat committer.
> 
> Please join me in welcoming him.

Great to have you.

-chris

-
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-8-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/200

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] 1710578
Blamelist: kkolinko

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: r1710630 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java

[remm]

Author: remm
Date: Mon Oct 26 15:36:24 2015
New Revision: 1710630

URL: http://svn.apache.org/viewvc?rev=1710630=rev
Log:
Check capacity first (you never know ...).

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1710630=1710629=1710630=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Mon 
Oct 26 15:36:24 2015
@@ -608,11 +608,11 @@ public final class OpenSSLEngine extends
 idx++;
 }
 }
-if (pendingApp == 0) {
+if (capacity == 0) {
+break;
+} else if (pendingApp == 0) {
 primingSSLRead();
 pendingApp = SSL.pendingReadableBytesInSSL(ssl);
-} else if (capacity == 0) {
-break;
 }
 }
 



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

svn commit: r1710632 - in /tomcat/trunk/java/org/apache: catalina/core/ApplicationHttpRequest.java catalina/core/StandardContext.java catalina/realm/JNDIRealm.java jasper/compiler/TagFileProcessor.jav

[violetagg]

Author: violetagg
Date: Mon Oct 26 15:41:58 2015
New Revision: 1710632

URL: http://svn.apache.org/viewvc?rev=1710632=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58545
Use entrySet() instead of keySet() when one need to obtain the value for a 
corresponding key. Based on a patch provided by Anthony Whitford.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1710632=1710631=1710632=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Mon 
Oct 26 15:41:58 2015
@@ -24,8 +24,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 
 import javax.servlet.DispatcherType;
@@ -887,16 +887,16 @@ class ApplicationHttpRequest extends Htt
 encoding = "ISO-8859-1";
 RequestUtil.parseParameters(queryParameters, queryParamString,
 encoding);
-Iterator keys = parameters.keySet().iterator();
-while (keys.hasNext()) {
-String key = keys.next();
-Object value = queryParameters.get(key);
+for (Entry entry : parameters.entrySet()) {
+String entryKey = entry.getKey();
+String[] entryValue = entry.getValue();
+Object value = queryParameters.get(entryKey);
 if (value == null) {
-queryParameters.put(key, parameters.get(key));
+queryParameters.put(entryKey, entryValue);
 continue;
 }
 queryParameters.put
-(key, mergeValues(value, parameters.get(key)));
+(entryKey, mergeValues(value, entryValue));
 }
 parameters = queryParameters;
 

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1710632=1710631=1710632=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Oct 26 
15:41:58 2015
@@ -4606,12 +4606,10 @@ public class StandardContext extends Con
 
 // Release all Filter and FilterConfig instances
 synchronized (filterConfigs) {
-Iterator names = filterConfigs.keySet().iterator();
-while (names.hasNext()) {
-String name = names.next();
+for (Entry entry : 
filterConfigs.entrySet()) {
 if (getLogger().isDebugEnabled())
-getLogger().debug(" Stopping filter '" + name + "'");
-ApplicationFilterConfig filterConfig = filterConfigs.get(name);
+getLogger().debug(" Stopping filter '" + entry.getKey() + 
"'");
+ApplicationFilterConfig filterConfig = entry.getValue();
 filterConfig.release();
 }
 filterConfigs.clear();

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1710632=1710631=1710632=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Mon Oct 26 
15:41:58 2015
@@ -1999,11 +1999,11 @@ public class JNDIRealm extends RealmBase
 throw ex;
 }
 
-Set keys = groupMap.keySet();
 if (containerLog.isTraceEnabled()) {
-containerLog.trace("  Found " + keys.size() + " direct roles");
-for (String key: keys) {
-containerLog.trace(  "  Found direct role " + key + " -> " + 
groupMap.get(key));
+Set> entries = groupMap.entrySet();
+containerLog.trace("  Found " + entries.size() + " direct roles");
+for (Entry entry : entries) {
+containerLog.trace(  "  Found direct role " + entry.getKey() + 
" -> " + entry.getValue());
 

svn commit: r1710628 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

[remm]

Author: remm
Date: Mon Oct 26 15:24:26 2015
New Revision: 1710628

URL: http://svn.apache.org/viewvc?rev=1710628=rev
Log:
Add a heuristic for NIO2 to avoid a useless SSL engine call on every read: if 
the previous read filled out the socket input buffer, try to unwrap first (it 
is most likely unwrap will produce more bytes in that case).

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1710628=1710627=1710628=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Mon Oct 
26 15:24:26 2015
@@ -65,6 +65,8 @@ public class SecureNio2Channel extends N
 private volatile boolean handshakeComplete;
 private volatile HandshakeStatus handshakeStatus; //gets set by handshake
 
+private volatile boolean unwrapBeforeRead = false;
+
 protected boolean closed;
 protected boolean closing;
 
@@ -572,9 +574,14 @@ public class SecureNio2Channel extends N
 
 private class FutureRead implements Future {
 private final ByteBuffer dst;
-private final Future integer = null;
+private final Future integer;
 private FutureRead(ByteBuffer dst) {
 this.dst = dst;
+if (unwrapBeforeRead || netInBuffer.position() > 0) {
+this.integer = null;
+} else {
+this.integer = sc.read(netInBuffer);
+}
 }
 @Override
 public boolean cancel(boolean mayInterruptIfRunning) {
@@ -654,6 +661,11 @@ public class SecureNio2Channel extends N
 throw new ExecutionException(new 
IOException(sm.getString("channel.nio.ssl.unwrapFail", unwrap.getStatus(;
 }
 } while ((netInBuffer.position() != 0)); //continue to unwrapping 
as long as the input buffer has stuff
+if (!dst.hasRemaining()) {
+unwrapBeforeRead = true;
+} else {
+unwrapBeforeRead = false;
+}
 return Integer.valueOf(read);
 }
 }
@@ -820,6 +832,11 @@ public class SecureNio2Channel extends N
 }
 // continue to unwrap as long as the input buffer has 
stuff
 } while (netInBuffer.position() != 0);
+if (!dst.hasRemaining()) {
+unwrapBeforeRead = true;
+} else {
+unwrapBeforeRead = false;
+}
 // If everything is OK, so complete
 handler.completed(Integer.valueOf(read), attach);
 } catch (Exception e) {
@@ -832,7 +849,11 @@ public class SecureNio2Channel extends N
 handler.failed(exc, attach);
 }
 };
-
readCompletionHandler.completed(Integer.valueOf(netInBuffer.position()), 
attachment);
+if (unwrapBeforeRead || netInBuffer.position() > 0) {
+
readCompletionHandler.completed(Integer.valueOf(netInBuffer.position()), 
attachment);
+} else {
+sc.read(netInBuffer, timeout, unit, attachment, 
readCompletionHandler);
+}
 }
 
 @Override
@@ -893,6 +914,16 @@ public class SecureNio2Channel extends N
 throw new 
IOException(sm.getString("channel.nio.ssl.unwrapFail", unwrap.getStatus()));
 }
 } while ((netInBuffer.position() != 0)); //continue to 
unwrapping as long as the input buffer has stuff
+int capacity = 0;
+final int endOffset = offset + length;
+for (int i = offset; i < endOffset; i++) {
+capacity += dsts[i].remaining();
+}
+if (capacity == 0) {
+unwrapBeforeRead = true;
+} else {
+unwrapBeforeRead = false;
+}
 // If everything is OK, so complete
 handler.completed(Long.valueOf(read), attach);
 } catch (Exception e) {
@@ -905,7 +936,7 @@ public class SecureNio2Channel extends N
 handler.failed(exc, attach);
 }
 };
-if (netInBuffer.position() > 0) {
+if (unwrapBeforeRead || netInBuffer.position() > 0) {
 
readCompletionHandler.completed(Integer.valueOf(netInBuffer.position()), 
attachment);
 } else {
 sc.read(netInBuffer, timeout, unit, attachment, 
readCompletionHandler);

Re: [ANN] New committer: Martin Grigorov

[Felix Schumacher]

Am 26. Oktober 2015 15:35:52 MEZ, schrieb Mark Thomas :
>On behalf of the Tomcat committers I am pleased to announce that
>Martin Grigorov (mgrigorov) has been voted in as a new Tomcat
>committer.
>
>Please join me in welcoming him.

Congrats!

  Felix

>
>Regards,
>
>Mark
>
>-
>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

[Bug 58551] Support plain and ssl on the same port

[bugzilla]

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

--- Comment #2 from romain.manni-bucau  ---
Here is the interest then ;)

In embedded mode it would be very fancy, in particularly since embedded tomcat
supports a single port and also cause cloud providers allows most of the time a
single port to be exposed.

-- 
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 58551] Support plain and ssl on the same port

[bugzilla]

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

--- Comment #3 from Mark Thomas  ---
Given that user agents are written on the basis of different default ports for
HTTP and HTTP I don't see this causing anything but problems for end users.

Regarding cloud providers I'd be surprised if any were exposing Tomcat directly
to the Internet.  I'd expect there to be some form of load balancing to support
transparent horizontal scaling.

I'm far from convinced this is a good idea.

-- 
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: r1710660 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/realm/ java/org/apache/jasper/compiler/ java/org/apache/tomcat/websocket/server/ webapps/doc

[violetagg]

Author: violetagg
Date: Mon Oct 26 17:32:48 2015
New Revision: 1710660

URL: http://svn.apache.org/viewvc?rev=1710660=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58545
Merged revision 1710632 from tomcat/trunk:
Use entrySet() instead of keySet() when one need to obtain the value for a 
corresponding key. Based on a patch provided by Anthony Whitford.

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 17:32:48 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,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578
-/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
 

[Bug 58551] Support plain and ssl on the same port

[bugzilla]

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

--- Comment #1 from Remy Maucherat  ---
There has never been any interest in Tomcat to add "port unification", and now
that unencrypted is going to be on the decline, it is even less likely this
feature would be accepted.

-- 
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 58545] WsHandshakeRequest inefficient use of keySet

[bugzilla]

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

Violeta Georgieva  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Violeta Georgieva  ---
Hi,

Thanks for the report and the patch.
I applied the same fix on other places in the code also.
The fix is available in trunk, 8.0.x (for 8.0.29 onwards) and 7.0.x (for 7.0.66
onwards)

Regards,
Violeta

-- 
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 58551] Support plain and ssl on the same port

[bugzilla]

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

--- Comment #4 from romain.manni-bucau  ---
@Mark: doesnt change the fact you still have a single port to bind and can need
both (internal vs external for a trivial sample). Also several cloud providers
are exposing tomcat directly whatever you think about that. Finally I dont get
the user agent case, more and more instances are not used with browsers today.

-- 
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: [ANN] New committer: Martin Grigorov

[Christopher Schultz]

All,

On 10/26/15 10:35 AM, Mark Thomas wrote:
> On behalf of the Tomcat committers I am pleased to announce that
> Martin Grigorov (mgrigorov) has been voted in as a new Tomcat committer.
> 
> Please join me in welcoming him.

When it rains (committers), it pours!

Welcome!

-chris

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

svn commit: r1710650 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java

[remm]

Author: remm
Date: Mon Oct 26 16:23:48 2015
New Revision: 1710650

URL: http://svn.apache.org/viewvc?rev=1710650=rev
Log:
Cleanup the unwrap algorithm.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1710650=1710649=1710650=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java Mon 
Oct 26 16:23:48 2015
@@ -545,35 +545,29 @@ public final class OpenSSLEngine extends
 }
 
 // Write encrypted data to network BIO
-int bytesConsumed = -1;
+int written = -1;
 try {
-int written = writeEncryptedData(src);
-if (written >= 0) {
-if (bytesConsumed == -1) {
-bytesConsumed = written;
-} else {
-bytesConsumed += written;
-}
-}
+written = writeEncryptedData(src);
 } catch (Exception e) {
 throw new SSLException(e);
 }
-if (bytesConsumed >= 0) {
-primingSSLRead();
-} else {
-// Reset to 0 as -1 is used to signal that nothing was written and 
no priming read needs to be done
-bytesConsumed = 0;
+// OpenSSL can return 0 or -1 to these calls if nothing was written
+if (written < 0) {
+written = 0;
 }
 
 // There won't be any application data until we're done handshaking
 //
 // We first check handshakeFinished to eliminate the overhead of extra 
JNI call if possible.
-int pendingApp = (handshakeFinished || SSL.isInInit(ssl) == 0) ? 
SSL.pendingReadableBytesInSSL(ssl) : 0;
+int pendingApp = pendingReadableBytesInSSL();
+if (!handshakeFinished) {
+pendingApp = 0;
+}
 int bytesProduced = 0;
 int idx = offset;
 // Do we have enough room in dsts to write decrypted data?
 if (capacity < pendingApp) {
-return new SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, 
getHandshakeStatus(), bytesConsumed, 0);
+return new SSLEngineResult(SSLEngineResult.Status.BUFFER_OVERFLOW, 
getHandshakeStatus(), written, 0);
 }
 
 while (pendingApp > 0) {
@@ -611,8 +605,7 @@ public final class OpenSSLEngine extends
 if (capacity == 0) {
 break;
 } else if (pendingApp == 0) {
-primingSSLRead();
-pendingApp = SSL.pendingReadableBytesInSSL(ssl);
+pendingApp = pendingReadableBytesInSSL();
 }
 }
 
@@ -622,15 +615,18 @@ public final class OpenSSLEngine extends
 closeOutbound();
 closeInbound();
 }
-if (bytesProduced == 0 && bytesConsumed == 0) {
-return new 
SSLEngineResult(SSLEngineResult.Status.BUFFER_UNDERFLOW, getHandshakeStatus(), 
bytesConsumed, bytesProduced);
+if (bytesProduced == 0 && written == 0) {
+return new 
SSLEngineResult(SSLEngineResult.Status.BUFFER_UNDERFLOW, getHandshakeStatus(), 
0, 0);
 } else {
-return new SSLEngineResult(getEngineStatus(), 
getHandshakeStatus(), bytesConsumed, bytesProduced);
+return new SSLEngineResult(getEngineStatus(), 
getHandshakeStatus(), written, bytesProduced);
 }
 }
 
-private void primingSSLRead()
+private int pendingReadableBytesInSSL()
 throws SSLException {
+// NOTE: Calling a fake read is necessary before calling 
pendingReadableBytesInSSL because
+// SSL_pending will return 0 if OpenSSL has not started the current 
TLS record
+// See https://www.openssl.org/docs/manmaster/ssl/SSL_pending.html
 int lastPrimingReadResult = SSL.readFromSSL(ssl, EMPTY_ADDR, 0); // 
priming read
 // check if SSL_read returned <= 0. In this case we need to check the 
error and see if it was something
 // fatal.
@@ -648,6 +644,7 @@ public final class OpenSSLEngine extends
 throw new SSLException(err);
 }
 }
+return SSL.pendingReadableBytesInSSL(ssl);
 }
 
 @Override



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

[Bug 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol

[bugzilla]

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

--- Comment #21 from Remy Maucherat  ---
This could use another trunk retest.

-- 
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 58551] New: Support plain and ssl on the same port

[bugzilla]

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

Bug ID: 58551
   Summary: Support plain and ssl on the same port
   Product: Tomcat 9
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: rmannibu...@gmail.com

Opened on tomcat 9 but actually this issue targets all supported tomcat
versions.

The idea is to add a kind of wrapper on top of the actual ssl connection to
activate or skip ssl for the current request ().

Goal is to avoid to need 2 ports for HTTP transport where a single one is
needed.

This has been done for cassandra
(https://issues.apache.org/jira/secure/attachment/12767756/0001-CASSANDRA-8803-Allow-to-serve-plain-and-encrypted-na.patch)
and is quite convenient. I think the more and more common "embedded" usage
would benefit from it a lot.

-- 
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: r1710659 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/realm/ java/org/apache/jasper/compiler/ java/org/apache/tomcat/websocket/server/ webapps/doc

[violetagg]

Author: violetagg
Date: Mon Oct 26 17:10:49 2015
New Revision: 1710659

URL: http://svn.apache.org/viewvc?rev=1710659=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58545
Merged revision 1710632 from tomcat/trunk:
Use entrySet() instead of keySet() when one need to obtain the value for a 
corresponding key. Based on a patch provided by Anthony Whitford.

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 26 17:10:49 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,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,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,1
 

RE: [ANN] New committer: Martin Grigorov

[Konstantin Preißer]

> -Original Message-
> From: Mark Thomas [mailto:ma...@apache.org]
> Sent: Monday, October 26, 2015 3:36 PM
> 
> On behalf of the Tomcat committers I am pleased to announce that
> Martin Grigorov (mgrigorov) has been voted in as a new Tomcat committer.
> 
> Please join me in welcoming him.

Welcome!

Regards,
Konstantin Preißer



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