svn commit: r1712227 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/loader/ java

[markt]

Author: markt
Date: Tue Nov  3 09:18:06 2015
New Revision: 1712227

URL: http://svn.apache.org/viewvc?rev=1712227=rev
Log:
String.indexOf(String) -> String.indexOf(char) where possible
More general fix for an issue identified in 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58541

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
tomcat/tc7.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java

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

tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 09:18: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,1710574,1710578

svn commit: r1712236 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/authenticator/TestDigestAuthenticator.java

[markt]

Author: markt
Date: Tue Nov  3 09:37:07 2015
New Revision: 1712236

URL: http://svn.apache.org/viewvc?rev=1712236=rev
Log:
Fix search/replace error in r1712227

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

tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 09:37:07 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,1712226,1712229
-/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
 

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

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

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1712225
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1712228 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java

[markt]

Author: markt
Date: Tue Nov  3 09:22:49 2015
New Revision: 1712228

URL: http://svn.apache.org/viewvc?rev=1712228=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58539
Logical rather than bitwise AND is required here

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1712228=1712227=1712228=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Tue Nov  3 
09:22:49 2015
@@ -469,7 +469,7 @@ public abstract class WsFrameBase {
 CloseCodes.TOO_BIG,
 sm.getString("wsFrame.textMessageTooBig")));
 }
-} else if (cr.isUnderflow() & !last) {
+} else if (cr.isUnderflow() && !last) {
 // End of frame and possible message as well.
 
 if (continuationExpected) {



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

svn commit: r1712229 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsFrameBase.java

[markt]

Author: markt
Date: Tue Nov  3 09:23:47 2015
New Revision: 1712229

URL: http://svn.apache.org/viewvc?rev=1712229=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58539
Logical rather than bitwise AND is required here

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 09:23:47 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 58541] CGIServlet and WebdavServlet code improvements

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Issues fixed across the code base rather than just these 2 classes.

Fixed in trunk, 8.0.x (for 8.0.29 onwards) and 7.0.x (for 7.0.66 onwards).

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1712226 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/loader/ java

[markt]

Author: markt
Date: Tue Nov  3 09:13:39 2015
New Revision: 1712226

URL: http://svn.apache.org/viewvc?rev=1712226=rev
Log:
String.indexOf(String) -> String.indexOf(char) where possible
More general fix for an issue identified in 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58541

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java

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

tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 09:13:39 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
 

svn commit: r1712230 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/WsFrameBase.java

[markt]

Author: markt
Date: Tue Nov  3 09:25:03 2015
New Revision: 1712230

URL: http://svn.apache.org/viewvc?rev=1712230=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58539
Logical rather than bitwise AND is required here

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 09:25: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,1712226
-/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 58539] WsFrameBase processDataText uses bitwise and

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #2 from Mark Thomas  ---
Fixed in trunk, 8.0.x (for 8.0.29 onwards) and 7.0.x (for 7.0.66 onwards).

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1712231 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Tue Nov  3 09:27:07 2015
New Revision: 1712231

URL: http://svn.apache.org/viewvc?rev=1712231=rev
Log:
Vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1712231=1712230=1712231=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 09:27:07 2015
@@ -42,7 +42,7 @@ PATCHES PROPOSED TO BACKPORT:
   https://svn.apache.org/r1707054
   - to be applied to extras.xml line 220
   +1: kkolinko
-  -1:
+  -1: markt - This appears to be unnecessary
 
 * Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58508
   http://svn.apache.org/viewvc?rev=1710353=rev



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

svn commit: r1712232 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/mbeans/MBeanUtils.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Nov  3 09:30:37 2015
New Revision: 1712232

URL: http://svn.apache.org/viewvc?rev=1712232=rev
Log:
6.0.x is now CTR so no need to wait for 3 +1s
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58508
Escape role names from user database when generating associated MBeans in case 
the role name contains characters not permitted in an MBean name. 

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 09:30:37 2015
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541
 
,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1696381,1701945
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1693108,1694291,1696379,1701944
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 

[Bug 58508] role_name in tomcat-users.xml : invalid character

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #5 from Mark Thomas  ---
Fixed in 6.0.x for 6.0.45 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1712235 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/authenticator/TestDigestAuthenticator.java

[markt]

Author: markt
Date: Tue Nov  3 09:36:43 2015
New Revision: 1712235

URL: http://svn.apache.org/viewvc?rev=1712235=rev
Log:
Fix search/replace error in r1712226

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

tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 09:36:43 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: r1712225 - in /tomcat/trunk: java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/authenticator/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/loader/ java/org/apache

[markt]

Author: markt
Date: Tue Nov  3 09:10:59 2015
New Revision: 1712225

URL: http://svn.apache.org/viewvc?rev=1712225=rev
Log:
String.indexOf(String) -> String.indexOf(char) where possible
More general fix for an issue identified in 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58541

Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java

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

tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java

tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1712225=1712224=1712225=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Tue 
Nov  3 09:10:59 2015
@@ -162,8 +162,8 @@ public class JMXAccessorQueryTask extend
 if (!attrs[i].isReadable())
 continue;
 String attName = attrs[i].getName();
-if (attName.indexOf("=") >= 0 || attName.indexOf(":") >= 0
-|| attName.indexOf(" ") >= 0) {
+if (attName.indexOf('=') >= 0 || attName.indexOf(':') >= 0
+|| attName.indexOf(' ') >= 0) {
 continue;
 }
 

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1712225=1712224=1712225=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 
Tue Nov  3 09:10:59 2015
@@ -519,7 +519,7 @@ public class DigestAuthenticator extends
 }
 
 // Validate nonce
-int i = nonce.indexOf(":");
+int i = nonce.indexOf(':');
 if (i < 0 || (i + 1) == nonce.length()) {
 return false;
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1712225=1712224=1712225=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java 
Tue Nov  3 09:10:59 2015
@@ -284,7 +284,7 @@ public class JvmRouteBinderValve extends
 Request request, String sessionId, String localJvmRoute) {
 // get requested jvmRoute.
 String requestJvmRoute = null;
-int index = sessionId.indexOf(".");
+int index = sessionId.indexOf('.');
 if (index > 0) {
 requestJvmRoute = sessionId
 .substring(index + 1, sessionId.length());

Modified: 
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1712225=1712224=1712225=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
(original)
+++ 

svn commit: r1712233 - in /tomcat/trunk/test/org/apache/catalina/authenticator: TestDigestAuthenticator.java TestJaspicDigestAuthenticator.java

[markt]

Author: markt
Date: Tue Nov  3 09:35:32 2015
New Revision: 1712233

URL: http://svn.apache.org/viewvc?rev=1712233=rev
Log:
Fix search/replace error in r1712225

Modified:

tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java

tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java

Modified: 
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1712233=1712232=1712233=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
 Tue Nov  3 09:35:32 2015
@@ -302,7 +302,7 @@ public class TestDigestAuthenticator ext
 String authHeader = authHeaders.iterator().next();
 
 int start = authHeader.indexOf("nonce=\"") + 7;
-int end = authHeader.indexOf('\'', start);
+int end = authHeader.indexOf('\"', start);
 return authHeader.substring(start, end);
 }
 
@@ -313,7 +313,7 @@ public class TestDigestAuthenticator ext
 String authHeader = authHeaders.iterator().next();
 
 int start = authHeader.indexOf("opaque=\"") + 8;
-int end = authHeader.indexOf('\'', start);
+int end = authHeader.indexOf('\"', start);
 return authHeader.substring(start, end);
 }
 

Modified: 
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java?rev=1712233=1712232=1712233=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java
 Tue Nov  3 09:35:32 2015
@@ -315,7 +315,7 @@ public class TestJaspicDigestAuthenticat
 String authHeader = authHeaders.iterator().next();
 
 int start = authHeader.indexOf("nonce=\"") + 7;
-int end = authHeader.indexOf('\'', start);
+int end = authHeader.indexOf('\"', start);
 return authHeader.substring(start, end);
 }
 
@@ -326,7 +326,7 @@ public class TestJaspicDigestAuthenticat
 String authHeader = authHeaders.iterator().next();
 
 int start = authHeader.indexOf("opaque=\"") + 8;
-int end = authHeader.indexOf('\'', start);
+int end = authHeader.indexOf('\"', start);
 return authHeader.substring(start, end);
 }
 



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

Re: svn commit: r1712231 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Konstantin Kolinko]

2015-11-03 12:27 GMT+03:00  :
> Author: markt
> Date: Tue Nov  3 09:27:07 2015
> New Revision: 1712231
>
> URL: http://svn.apache.org/viewvc?rev=1712231=rev
> Log:
> Vote
>
> Modified:
> tomcat/tc6.0.x/trunk/STATUS.txt
>
> Modified: tomcat/tc6.0.x/trunk/STATUS.txt
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1712231=1712230=1712231=diff
> ==
> --- tomcat/tc6.0.x/trunk/STATUS.txt (original)
> +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 09:27:07 2015
> @@ -42,7 +42,7 @@ PATCHES PROPOSED TO BACKPORT:
>https://svn.apache.org/r1707054
>- to be applied to extras.xml line 220
>+1: kkolinko
> -  -1:
> +  -1: markt - This appears to be unnecessary


Why unnecessary?

In 6.0.44 in /v6.0.44/bin/extras/tomcat-juli-adapters.jar  the
LogFactoryImpl.class is excluded, but LogFactoryImpl$1.class,
LogFactoryImpl$2.class, LogFactoryImpl$3.class  are still present.


Best regards,
Konstantin Kolinko

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

svn commit: r1712256 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/ajp.xml webapps/docs/config/http.xml

[markt]

Author: markt
Date: Tue Nov  3 11:17:11 2015
New Revision: 1712256

URL: http://svn.apache.org/viewvc?rev=1712256=rev
Log:
Add a note to maxPostSize suggested by Christopher Simons

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 11:17:11 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,1712226,1712229,1712235
-/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 58577] JMX Proxy Servlet can't handle overloaded methos

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

   Severity|normal  |enhancement

-- 
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: r1712285 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java

[markt]

Author: markt
Date: Tue Nov  3 13:01:37 2015
New Revision: 1712285

URL: http://svn.apache.org/viewvc?rev=1712285=rev
Log:
Fix incorrect skipping of test identified by kkolinko during Tomcat Native 
1.2.1 testing

Modified:

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1712285=1712284=1712285=diff
==
--- 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
 Tue Nov  3 13:01:37 2015
@@ -103,7 +103,8 @@ public class TestWebSocketFrameClientSSL
 //  connector.
 Assume.assumeFalse(
 "Skip this test on BIO. TODO: investigate options to make it 
pass with HTTP BIO connector",
-
getTomcatInstance().getConnector().getProtocol().equals("HTTP/1.1"));
+
getTomcatInstance().getConnector().getProtocolHandlerClassName().equals(
+"org.apache.coyote.http11.Http11Protocol"));
 
 Tomcat tomcat = getTomcatInstance();
 // No file system docBase required



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

[Mark Thomas]

On 03/11/2015 12:31, Konstantin Kolinko wrote:

> Interim results.  Testing 7.0.x (@r1712220) with Java 8u66 (32-bit)
> 
>[concat] Testsuites with failed tests:
>[concat] 
> TEST-org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.APR.txt
>[concat] 
> TEST-org.apache.catalina.authenticator.TestSSOnonLoginAndBasicAuthenticator.APR.txt
>[concat] 
> TEST-org.apache.catalina.authenticator.TestSSOnonLoginAndDigestAuthenticator.APR.txt
>[concat] 
> TEST-org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.APR.txt
>[concat] TEST-org.apache.tomcat.websocket.TestWsWebSocketContainer.APR.txt
> 
> 1) All 3 authenticator tests are failing in an odd way:

I can't repeat this.

> 2) org.apache.tomcat.websocket.TestWebSocketFrameClientSSL
> 
> An odd "SKIPPED" line and a failed test.

Fixed as you suggested.

> Testcase: testConnectToServerEndpointSSL took 63,823 sec
> FAILED
> expected:<10> but was:<0>
> junit.framework.AssertionFailedError: expected:<10> but was:<0>
> at 
> org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.testConnectToServerEndpointSSL(TestWebSocketFrameClientSSL.java:92)

I see this error. I'll take a look.

> 3) org.apache.tomcat.websocket.TestWsWebSocketContainer
> 
> Testcase: testConnectToServerEndpointSSL took 10,852 sec
> FAILED
> null
> junit.framework.AssertionFailedError
> at 
> org.apache.tomcat.websocket.TestWsWebSocketContainer.testConnectToServerEndpointSSL(TestWsWebSocketContainer.java:815)

I see this error too.

Mark

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

svn commit: r1712255 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/config/ajp.xml webapps/docs/config/http.xml

[markt]

Author: markt
Date: Tue Nov  3 11:16:16 2015
New Revision: 1712255

URL: http://svn.apache.org/viewvc?rev=1712255=rev
Log:
Add a note to maxPostSize suggested by Christopher Simons

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 11:16:16 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 58554] Cannot output html from jsp files inside of lambdas

[bugzilla]

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

--- Comment #4 from Joseph Lenton  ---
> As an aside, the example in the description wouldn't work even if out were 
> final due to the IOExceptions thrown. A try/catch block is also required.

If you add 'throws IOException' on the appropriate methods then the example
should compile.

-- 
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: [VOTE] Release Apache Tomcat Native 1.2.1

[Konstantin Kolinko]

2015-11-03 0:04 GMT+03:00 Mark Thomas :
> Version 1.2.1 includes the following changes:
> - Fix to enable 1.2.x to work with Tomcat releases that do not have
>   the SNI callback implemented on the Java side
>
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
>
> The Apache Tomcat Native 1.2.1 is
>  [ ] Stable, go ahead and release
>  [ ] Broken because of ...


Interim results.  Testing 7.0.x (@r1712220) with Java 8u66 (32-bit)

   [concat] Testsuites with failed tests:
   [concat] 
TEST-org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.APR.txt
   [concat] 
TEST-org.apache.catalina.authenticator.TestSSOnonLoginAndBasicAuthenticator.APR.txt
   [concat] 
TEST-org.apache.catalina.authenticator.TestSSOnonLoginAndDigestAuthenticator.APR.txt
   [concat] TEST-org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.APR.txt
   [concat] TEST-org.apache.tomcat.websocket.TestWsWebSocketContainer.APR.txt

1) All 3 authenticator tests are failing in an odd way:

I guess that there is a change in Java 8 HttpURLConnection so that
tests in Tomcat 7 became incorrect.

IIRC somebody mentioned that there is some security feature protecting
access tor request headers, and it can be turned off by some option.

Testcase: testBasicLoginRejectProtectedWithSession took 0,265 sec
Caused an ERROR
Illegal character(s) in message header field: Cookie:
java.lang.IllegalArgumentException: Illegal character(s) in message
header field: Cookie:
at 
sun.net.www.protocol.http.HttpURLConnection.checkMessageHeader(HttpURLConnection.java:489)
at 
sun.net.www.protocol.http.HttpURLConnection.isExternalMessageHeaderAllowed(HttpURLConnection.java:459)
at 
sun.net.www.protocol.http.HttpURLConnection.setRequestProperty(HttpURLConnection.java:3018)
at 
org.apache.catalina.startup.TomcatBaseTest.methodUrl(TomcatBaseTest.java:648)
at 
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:625)
at 
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:619)
at 
org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.doTestNonLogin(TestNonLoginAndBasicAuthenticator.java:419)
at 
org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.testBasicLoginRejectProtectedWithSession(TestNonLoginAndBasicAuthenticator.java:401)



2) org.apache.tomcat.websocket.TestWebSocketFrameClientSSL

An odd "SKIPPED" line and a failed test.

Regarding 'SKIPPED' line maybe it is solved by replacing
s/getConnector().getProtocol()
  /getConnector().getProtocolHandlerClassName() /
like done elsewhere.


Testcase: testBug56032 took 0,29 sec
SKIPPED: Skip this test on BIO. TODO: investigate options to make
it pass with HTTP BIO connector
Testcase: testBug56032 took 0,296 sec
Testcase: testConnectToServerEndpointSSL took 63,823 sec
FAILED
expected:<10> but was:<0>
junit.framework.AssertionFailedError: expected:<10> but was:<0>
at 
org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.testConnectToServerEndpointSSL(TestWebSocketFrameClientSSL.java:92)


3) org.apache.tomcat.websocket.TestWsWebSocketContainer

Testcase: testConnectToServerEndpointSSL took 10,852 sec
FAILED
null
junit.framework.AssertionFailedError
at 
org.apache.tomcat.websocket.TestWsWebSocketContainer.testConnectToServerEndpointSSL(TestWsWebSocketContainer.java:815)


All other tests are OK.

Best regards,
Konstantin Kolinko

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

[Bug 58577] New: JMX Proxy Servlet can't handle overloaded methos

[bugzilla]

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

Bug ID: 58577
   Summary: JMX Proxy Servlet can't handle overloaded methos
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
OS: Windows NT
Status: NEW
  Severity: normal
  Priority: P2
 Component: Manager
  Assignee: dev@tomcat.apache.org
  Reporter: jcompag...@apache.org

currently the JMXProxy when invoking an operation does this:

 ObjectName oname=new ObjectName( onameStr );
MBeanOperationInfo methodInfo =
registry.getMethodInfo(oname,operation);
MBeanParameterInfo[] signature = methodInfo.getSignature();

so it calls the registry for a method info for a specific bean and operation

that Registry does this:

 public MBeanOperationInfo getMethodInfo( ObjectName oname, String opName )
{
MBeanInfo info=null;
try {
info=server.getMBeanInfo(oname);
} catch (Exception e) {
log.info( "Can't find metadata " + oname );
return null;
}
MBeanOperationInfo attInfo[]=info.getOperations();
for( int i=0; i

Re: [VOTE] Release Apache Tomcat Native 1.2.1

[Violeta Georgieva]

2015-11-03 15:05 GMT+02:00 Mark Thomas :
>
> On 03/11/2015 12:31, Konstantin Kolinko wrote:
>
> > Interim results.  Testing 7.0.x (@r1712220) with Java 8u66 (32-bit)
> >
> >[concat] Testsuites with failed tests:
> >[concat]
TEST-org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.APR.txt
> >[concat]
TEST-org.apache.catalina.authenticator.TestSSOnonLoginAndBasicAuthenticator.APR.txt
> >[concat]
TEST-org.apache.catalina.authenticator.TestSSOnonLoginAndDigestAuthenticator.APR.txt
> >[concat]
TEST-org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.APR.txt
> >[concat]
TEST-org.apache.tomcat.websocket.TestWsWebSocketContainer.APR.txt
> >
> > 1) All 3 authenticator tests are failing in an odd way:
>
> I can't repeat this.

This was reported also during 7.0.65 voting [1]

Unfortunately I also cannot reproduce it.

Windows 8, x64, jdk 1.8.0_45
Loaded APR based Apache Tomcat Native library 1.2.1 using APR version 1.5.1.
OpenSSL successfully initialized (OpenSSL 1.0.2d 9 Jul 2015)

[1] http://marc.info/?l=tomcat-dev=144554705426625=2


>
> > 2) org.apache.tomcat.websocket.TestWebSocketFrameClientSSL
> >
> > An odd "SKIPPED" line and a failed test.
>
> Fixed as you suggested.
>
> > Testcase: testConnectToServerEndpointSSL took 63,823 sec
> > FAILED
> > expected:<10> but was:<0>
> > junit.framework.AssertionFailedError: expected:<10> but was:<0>
> > at
org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.testConnectToServerEndpointSSL(TestWebSocketFrameClientSSL.java:92)
>
> I see this error. I'll take a look.
>
> > 3) org.apache.tomcat.websocket.TestWsWebSocketContainer
> >
> > Testcase: testConnectToServerEndpointSSL took 10,852 sec
> > FAILED
> > null
> > junit.framework.AssertionFailedError
> > at
org.apache.tomcat.websocket.TestWsWebSocketContainer.testConnectToServerEndpointSSL(TestWsWebSocketContainer.java:815)
>
> I see this error too.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

Re: HTTP Pipelining with session management

[Mark Thomas]

On 03/11/2015 11:36, Roel Storms wrote:
> Hello,
> 
> 
> I was wondering if anything special is done with cookie based session
> management in order for it to deal with HTTP pipelining.

No.



> There are of course different scenario's that can be drawn but is there a
> way tomcat deals with this problem?

No.

> According to wikipedia, servers can
> easily deal with the issue of pipelining but I believe that is not the case
> when sessions are involved.

Tomcat supports pipelining but makes no assumptions about sessions. Keep
in mind that a proxy may be pipelining requests from different clients.

> Is this scenario realistic?

Yes.

> Is it possible that two sessions exist where
> the information in the first session will be lost?

Yes, one of those sessions is going to be lost.

> I know by default most browsers turn pipelining off because of a lot of
> proxies and servers not supporting it. Is this one of the reasons?

Supporting pipelining is a spec requirement so I'd be surprised if it
wasn't supported.

Session handling is certainly one reason not to use pipelining.

Mark

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

svn commit: r1712277 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/filters/ java/org/apache/tomcat/util/http/ webapps/docs/

[markt]

Author: markt
Date: Tue Nov  3 12:33:42 2015
New Revision: 1712277

URL: http://svn.apache.org/viewvc?rev=1712277=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58031
Make the (first) reason parameter parsing failed available as a request 
attribute and then use it to provide a better status code via the 
FailedRequstFilter (if configured).

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1712277=1712276=1712277=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 12:33:42 2015
@@ -28,14 +28,6 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58031
-  Provide a mechanism to enable a 413 response if maxPostSize is exceeded while
-  processing parameters
-  http://svn.apache.org/r1694433
-  http://svn.apache.org/r1694437
-  +1: markt, remm
-  -1:
-
 * Ensure LogFactoryImpl is excluded from extras/tomcat-juli-adapters jar.
   Reported by Benjamin Gandon on the dev list
   Mail thread: http://tomcat.markmail.org/thread/7iygcau3vja4cbui

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1712277=1712276=1712277=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java Tue Nov  3 
12:33:42 2015
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,9 +30,9 @@ public final class Globals {
 
 /**
  * The servlet context attribute under which we store the alternate
- * deployment descriptor for this web application 
+ * deployment descriptor for this web application
  */
-public static final String ALT_DD_ATTR = 
+public static final String ALT_DD_ATTR =
 "org.apache.catalina.deploy.alt_dd";
 
 /**
@@ -62,13 +62,13 @@ public final class Globals {
 /**
  * Request dispatcher state.
  */
-public static final String DISPATCHER_TYPE_ATTR = 
+public static final String DISPATCHER_TYPE_ATTR =
 "org.apache.catalina.core.DISPATCHER_TYPE";
 
 /**
  * Request dispatcher path.
  */
-public static final String DISPATCHER_REQUEST_PATH_ATTR = 
+public static final String DISPATCHER_REQUEST_PATH_ATTR =
 "org.apache.catalina.core.DISPATCHER_REQUEST_PATH";
 
 /**
@@ -223,8 +223,8 @@ public final class Globals {
  */
 public static final String FORWARD_REQUEST_URI_ATTR =
 "javax.servlet.forward.request_uri";
-
-
+
+
 /**
  * The request attribute under which the original context path is stored
  * on an forwarded dispatcher request.
@@ -264,7 +264,7 @@ public final class Globals {
 public static final String SERVLET_NAME_ATTR =
 "javax.servlet.error.servlet_name";
 
-
+
 /**
  * The name of the cookie used to pass the session identifier back
  * and forth with the client.
@@ -308,7 +308,7 @@ public final class Globals {
 public static final String SUBJECT_ATTR =
 "javax.security.auth.subject";
 
-
+
 /**
  * The servlet context attribute under which we record the set of
  * welcome files (as an object of type String[]) for this application.
@@ -338,7 +338,14 @@ public final class Globals {
 
 
 /**
- * The master flag which controls strict servlet specification 
+ * The reason that the parameter parsing failed.
+ */
+public static final String PARAMETER_PARSE_FAILED_REASON_ATTR =
+"org.apache.catalina.parameter_parse_failed_reason";
+
+
+/**
+ * The master flag which controls strict servlet specification
  * compliance.
  */
 public static final boolean STRICT_SERVLET_COMPLIANCE =

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL: 

[Bug 58031] Posting data exceeding maxPostSize should result in HTTP 413.

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #13 from Mark Thomas  ---
Fixed in 6.0.x for 6.0.45 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1712245 - /tomcat/tc6.0.x/trunk/STATUS.txt

[markt]

Author: markt
Date: Tue Nov  3 10:03:23 2015
New Revision: 1712245

URL: http://svn.apache.org/viewvc?rev=1712245=rev
Log:
Change vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1712245=1712244=1712245=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 10:03:23 2015
@@ -41,8 +41,8 @@ PATCHES PROPOSED TO BACKPORT:
   Mail thread: http://tomcat.markmail.org/thread/7iygcau3vja4cbui
   https://svn.apache.org/r1707054
   - to be applied to extras.xml line 220
-  +1: kkolinko
-  -1: markt - This appears to be unnecessary
+  +1: kkolinko, markt
+  -1:
 
   
 PATCHES/ISSUES THAT ARE STALLED:



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

Re: svn commit: r1712231 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Rémy Maucherat]

2015-11-03 11:02 GMT+01:00 Mark Thomas :

> I missed that there were inner classes. Consider my -1 withdrawn.
>
> But didn't we just switch to CTR ?

Rémy

svn commit: r1712250 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

[markt]

Author: markt
Date: Tue Nov  3 10:52:32 2015
New Revision: 1712250

URL: http://svn.apache.org/viewvc?rev=1712250=rev
Log:
Extend the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58228 to 
include getRealPath(String)

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1712250=1712249=1712250=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue Nov  
3 10:52:32 2015
@@ -382,7 +382,8 @@ public class ApplicationContext
 
 @Override
 public String getRealPath(String path) {
-return context.getRealPath(path);
+String validatedPath = validateResourcePath(path, true);
+return context.getRealPath(validatedPath);
 }
 
 
@@ -473,7 +474,7 @@ public class ApplicationContext
 @Override
 public URL getResource(String path) throws MalformedURLException {
 
-String validatedPath = validateResourcePath(path);
+String validatedPath = validateResourcePath(path, false);
 
 if (validatedPath == null) {
 throw new MalformedURLException(
@@ -492,7 +493,7 @@ public class ApplicationContext
 @Override
 public InputStream getResourceAsStream(String path) {
 
-String validatedPath = validateResourcePath(path);
+String validatedPath = validateResourcePath(path, false);
 
 if (validatedPath == null) {
 return null;
@@ -511,11 +512,15 @@ public class ApplicationContext
  * Returns null if the input path is not valid or a path that will be
  * acceptable to resoucres.getResource().
  */
-private String validateResourcePath(String path) {
+private String validateResourcePath(String path, boolean allowEmptyPath) {
 if (path == null) {
 return null;
 }
 
+if (path.length() == 0 && allowEmptyPath) {
+return path;
+}
+
 if (!path.startsWith("/")) {
 if (GET_RESOURCE_REQUIRE_SLASH) {
 return null;



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

[buildbot]

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-7-trunk/builds/141

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1712236
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1712252 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationContext.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Tue Nov  3 11:01:12 2015
New Revision: 1712252

URL: http://svn.apache.org/viewvc?rev=1712252=rev
Log:
Extend the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58228 to 
include getRealPath(String)

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 11:01:12 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 58228] ApplicationContext.GET_RESOURCE_REQUIRE_SLASH vs StandardRoot.getResource(String)

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #5 from Mark Thomas  ---
Fixed for get realPath in trunk and 8.0.x (for 8.0.29 onwards).

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

HTTP Pipelining with session management

[Roel Storms]

Hello,


I was wondering if anything special is done with cookie based session
management in order for it to deal with HTTP pipelining.
https://en.wikipedia.org/wiki/HTTP_pipelining

Take the following scenario:

   Client Request 1
Server

 --->
 Invoke's servlet

servlet calls request.getSession()

a session is created with SID1

  Request 2

 >
Invoke's servlet

 servlet calls request.getSession()

 a session is created with SID2
 Reply 1 (including SESSIONID : SID1)


<--
Client stores
SID1 in a cookie

 Request 3 (including SESSIONID : SID1)

 >
Invoke's servlet

 servlet calls request.getSession()

 the first session is used.
  Reply 2 (including SESSIONID : SID2)

 <-

 Request 4 (including SESSIONID : SID2)

 >
Invoke's servlet

 servlet calls request.getSession()

 the second session is used.
There are of course different scenario's that can be drawn but is there a
way tomcat deals with this problem? According to wikipedia, servers can
easily deal with the issue of pipelining but I believe that is not the case
when sessions are involved.

Is this scenario realistic? Is it possible that two sessions exist where
the information in the first session will be lost?

I know by default most browsers turn pipelining off because of a lot of
proxies and servers not supporting it. Is this one of the reasons?


Rgds,

Roel Storms

buildbot failure in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1712227
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

svn commit: r1712257 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/connector/Request.java

[markt]

Author: markt
Date: Tue Nov  3 11:25:44 2015
New Revision: 1712257

URL: http://svn.apache.org/viewvc?rev=1712257=rev
Log:
Differentiate between failure modes. Handling is currently identical but it 
won't be once BZ 58031 is addressed.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 11:25:44 2015
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989,1668541
 
,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1696381,1701945,1710353
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1693108,1694291,1696379,1701944,1710347
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,948057,95
 

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.0.x) 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-tc8.0.x-test-nio2 has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-nio2 :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/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-8.0.x/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 38 mins 30 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-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151103-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151103.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151103-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151103/bin
 /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-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-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build

Re: [VOTE] Release Apache Tomcat Native 1.2.1

[Mark Thomas]

On 03/11/2015 13:05, Mark Thomas wrote:
> On 03/11/2015 12:31, Konstantin Kolinko wrote:



>> Testcase: testConnectToServerEndpointSSL took 63,823 sec
>> FAILED
>> expected:<10> but was:<0>
>> junit.framework.AssertionFailedError: expected:<10> but was:<0>
>> at 
>> org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.testConnectToServerEndpointSSL(TestWebSocketFrameClientSSL.java:92)
> 
> I see this error. I'll take a look.
> 
>> 3) org.apache.tomcat.websocket.TestWsWebSocketContainer
>>
>> Testcase: testConnectToServerEndpointSSL took 10,852 sec
>> FAILED
>> null
>> junit.framework.AssertionFailedError
>> at 
>> org.apache.tomcat.websocket.TestWsWebSocketContainer.testConnectToServerEndpointSSL(TestWsWebSocketContainer.java:815)
> 
> I see this error too.

I've gone back to 9.0.x and am running the unit tests with Native 1.2.1.
I'm seeing failures but it is not clear at this point if the root cause
is a native bug or changes in native/OpenSSL behaviour that are not
correctly handled on the Java side.

Still looking...

Mark

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

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

[remm]

Author: remm
Date: Tue Nov  3 17:55:48 2015
New Revision: 1712358

URL: http://svn.apache.org/viewvc?rev=1712358=rev
Log:
58578: Avoid NPE when trying to do access logging on cookies for an unmapped 
request.

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

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1712358=1712357=1712358=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java Tue 
Nov  3 17:55:48 2015
@@ -2965,6 +2965,10 @@ public class Request
 
 cookiesConverted = true;
 
+if (getContext() == null) {
+return;
+}
+
 parseCookies();
 
 ServerCookies serverCookies = coyoteRequest.getCookies();

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=1712358=1712357=1712358=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Nov  3 17:55:48 2015
@@ -134,6 +134,10 @@
 to occur even in blocking mode, which caused problems with NIO2.
 (remm)
   
+  
+58578: Avoid NPE accessing cookies during access logging
+for request that had no context mapping. (remm)
+  
 
   
   



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

[Bug 58578] NullPointerException in Request.parseCookies().

[bugzilla]

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

Remy Maucherat  changed:

   What|Removed |Added

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

--- Comment #1 from Remy Maucherat  ---
>From what I see the context is null, so this means this is about requests that
have not been mapped but are access logged anyway.

This should be fixed in r1712358 that will be in Tomcat 8.0.29. Tomcat 7 is
likely not affected.

The cookie processor is associated with contexts in Tomcat 8+, so cookie
processing will not occur for unmapped requests and they will appear as if they
had no cookies. If this is somehow important (I do not think so at the moment),
then another "generic" cookie processor will have to exist for these kind of
situations.

-- 
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: [VOTE] Release Apache Tomcat Native 1.2.1

[Rainer Jung]

Am 03.11.2015 um 17:18 schrieb Christopher Schultz:

Mark,

On 11/2/15 4:04 PM, Mark Thomas wrote:

Version 1.2.1 includes the following changes:
- Fix to enable 1.2.x to work with Tomcat releases that do not have
   the SNI callback implemented on the Java side

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.1 is
  [ ] Stable, go ahead and release
  [ ] Broken because of ...


[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.1/
[2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_1


I don't have OpenSSL 1.0.2 on one of my Linux servers, and I get this
result:

$ ./configure --with-apr=../../apr-1.4.6 --with-ssl
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
checking for a BSD-compatible install... /usr/bin/install -c
checking for working mkdir -p... yes
Tomcat Native Version: 1.2.1
checking for chosen layout... tcnative
checking for APR... yes
configure: APR 1.4.6 detected.
./configure: line 2689: cd: /home/cschultz/projects/apr-1.4.6/build: No


We need to determine, where APR installed some build support files. 
configure does in line 2687


APR_BUILD_DIR="`$apr_config --installbuilddir`"

then cd to APR_BUILD_DIR and then pwd to get the dir path.

You might want to insert directly before line

2687   APR_BUILD_DIR="`$apr_config --installbuilddir`"

an

echo $apr_config

to check, which apr_config was actually used, whether the one from the 
APR you wanted to use, or another one. Then you can run


apr_config --installbuilddir

by yourself using the same apr_config, that your echo gave and look into 
the directory, that is returned by that command. That directory must 
exist and there needs to be an apr_rules.mk file in that directory.



such file or directory
   setting CC to "gcc"
   setting CPP to "gcc -E"
   adding "-I/usr/local/java-8/include" to TCNATIVE_PRIV_INCLUDES
checking for JDK os include directory...  linux
   adding "-I/usr/local/java-8/include/linux" to TCNATIVE_PRIV_INCLUDES
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking for OpenSSL library... using openssl from /usr/lib and /usr/include
checking OpenSSL library version >= 1.0.2...

Found   OPENSSL_VERSION_NUMBER 0x1000105f (OpenSSL 1.0.1e 11 Feb 2013)
Require OPENSSL_VERSION_NUMBER 0x1000200f or greater (1.0.2)

not compatible
checking for OpenSSL DSA support... yes
   setting TCNATIVE_LDFLAGS to "-lssl -lcrypto"
   adding "-DHAVE_OPENSSL" to CFLAGS
   setting TCNATIVE_LIBS to ""
   setting TCNATIVE_LIBS to "
/home/cschultz/projects/apr-1.4.6/libapr-1.la -luuid -lrt -lcrypt
-lpthread -ldl"
checking for apr_pollset_wakeup in -lapr-1... yes
   adding "-DHAVE_POLLSET_WAKEUP" to CFLAGS
cp: cannot stat `/apr_rules.mk': No such file or directory


Same root cause as above.


configure: creating ./config.status
config.status: creating tcnative.pc
config.status: creating Makefile
config.status: executing default commands
$ make
Makefile:47:
/home/cschultz/projects/apache/tomcat-native-1.2.1-src/native/build/rules.mk:
No such file or directory
make: *** No rule to make target
`/home/cschultz/projects/apache/tomcat-native-1.2.1-src/native/build/rules.mk'.
  Stop.


Presumably, this is due to the OpenSSL version problem, but configure
doesn't /appear/ to fail, and then make certainly does.

On my OS X system (once I babied the CLI built-tools back into working
order -- SO frustrating every time Apple updates something and breaks it
all), the build was clean -- not even a compiler warning.

I haven't tested it at all. Just the build on both systems.


The problem is due to some APR mismatch. See above.

Regards,

Rainer


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

[Bug 58578] NullPointerException in Request.parseCookies().

[bugzilla]

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

Corey Puffalt  changed:

   What|Removed |Added

Version|trunk   |8.0.21

-- 
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 58578] New: NullPointerException in Request.parseCookies().

[bugzilla]

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

Bug ID: 58578
   Summary: NullPointerException in Request.parseCookies().
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: cpj...@yeroc.ca

I've run into a NullPointerException when the AccessLogValve is configured to
log a cookie:

02-Nov-2015 18:19:45.461 SEVERE [ajp-nio-8009-exec-1]
org.apache.coyote.ajp.AbstractAjpProcessor.process Error processing request
 java.lang.NullPointerException
at
org.apache.catalina.connector.Request.parseCookies(Request.java:2948)
at
org.apache.catalina.connector.Request.convertCookies(Request.java:2963)
at org.apache.catalina.connector.Request.getCookies(Request.java:1992)
at
org.apache.catalina.valves.AbstractAccessLogValve$CookieElement.addElement(AbstractAccessLogValve.java:1335)
at
org.apache.catalina.valves.AbstractAccessLogValve.log(AbstractAccessLogValve.java:639)
at
org.apache.catalina.core.AccessLogAdapter.log(AccessLogAdapter.java:51)
at
org.apache.catalina.core.ContainerBase.logAccess(ContainerBase.java:1043)
at
org.apache.catalina.connector.CoyoteAdapter.postParseRequest(CoyoteAdapter.java:893)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:513)
at
org.apache.coyote.ajp.AbstractAjpProcessor.process(AbstractAjpProcessor.java:844)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:668)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1517)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1474)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:745)

02-Nov-2015 18:19:45.464 WARNING [ajp-nio-8009-exec-1]
org.apache.catalina.connector.CoyoteAdapter.log Exception while attempting to
add an entry to the access log
 java.lang.NullPointerException
at
org.apache.catalina.connector.Request.parseCookies(Request.java:2948)
at
org.apache.catalina.connector.Request.convertCookies(Request.java:2963)
at org.apache.catalina.connector.Request.getCookies(Request.java:1992)
at
org.apache.catalina.valves.AbstractAccessLogValve$CookieElement.addElement(AbstractAccessLogValve.java:1335)
at
org.apache.catalina.valves.AbstractAccessLogValve.log(AbstractAccessLogValve.java:639)
at
org.apache.catalina.core.AccessLogAdapter.log(AccessLogAdapter.java:51)
at
org.apache.catalina.core.StandardEngine.logAccess(StandardEngine.java:342)
at
org.apache.catalina.connector.CoyoteAdapter.log(CoyoteAdapter.java:675)
at
org.apache.coyote.ajp.AbstractAjpProcessor.process(AbstractAjpProcessor.java:853)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:668)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1517)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1474)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:745)

Here's the valve configuration:



RedHat has posted an article with the same exception noted:
https://access.redhat.com/solutions/1992003.  Unfortunately, the information is
hidden behind a paywall I don't have access to.  However I searched Bugzilla
and can find no evidence that they submitted a ticket upstream.

Thanks.

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

[remm]

Author: remm
Date: Tue Nov  3 17:50:37 2015
New Revision: 1712357

URL: http://svn.apache.org/viewvc?rev=1712357=rev
Log:
58578: Avoid NPE when trying to do access logging on cookies for an unmapped 
request.

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=1712357=1712356=1712357=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Nov  3 
17:50:37 2015
@@ -2892,6 +2892,10 @@ public class Request implements HttpServ
 
 cookiesConverted = true;
 
+if (getContext() == null) {
+return;
+}
+
 parseCookies();
 
 ServerCookies serverCookies = coyoteRequest.getCookies();



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

svn commit: r1712361 - /tomcat/trunk/build.properties.default

[markt]

Author: markt
Date: Tue Nov  3 18:11:13 2015
New Revision: 1712361

URL: http://svn.apache.org/viewvc?rev=1712361=rev
Log:
Add note about needing IPv4 on latest OSX for multicast tests to work

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1712361=1712360=1712361=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Nov  3 18:11:13 2015
@@ -50,6 +50,10 @@ test.threads=1
 # Note the Cobertura code coverage tool is GPLv2 licensed
 test.cobertura=false
 
+# Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
+# multicast tests to work
+#java.net.preferIPv4Stack=true
+
 # Location of GPG executable (used only for releases)
 gpg.exec=/path/to/gpg
 



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

[Bug 58577] JMX Proxy Servlet can't handle overloaded methods

[bugzilla]

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

Christopher Schultz  changed:

   What|Removed |Added

Summary|JMX Proxy Servlet can't |JMX Proxy Servlet can't
   |handle overloaded methos|handle overloaded methods

-- 
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: mod_jk 1.2.40, Apache 2.4.x and ForwardURICompatUnparsed

[Rainer Jung]

Am 03.11.2015 um 21:10 schrieb Henri Gomez:

Hi all

When I upgraded some HTTPd instance from 2.2 to 2.4, I got errors with
some VHost using

AllowEncodedSlashes On
JkOptions +ForwardURICompatUnparsed

This is what I should define to avoid Jenkins complain about invalid
configuration.

Error report is 500 and jk log report

jk_handler::mod_jk.c (2765): Could not init service for worker=myworker

Did some of you get same problem with ForwardURICompatUnparsed or
JkOptions on HTTPd 2.4.x ?


I never use a different "ForwardURI" than the default, so no useful 
experience here.


But:

- line number 2765 does not match the log statement for 1.2.40. So you 
must use another version here.


- the log statement "Could not init service for worker=myworker" to me 
seems completely unrelated to AllowEncodedSlashes and JkOptions 
+ForwardURICompatUnparsed. It indicates that something in the definition 
of the worker in workers.properties is problematic, e.g. no DNS 
resolution possible or similar. Aren't there other messages around that 
error? Maybe it helps to enable debug logging and look at the log lines 
immediately before that one. What is your definition of "myworker"?


Regards,

Rainer


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

Re: HTTP Pipelining with session management

[Roel Storms]

2015-11-03 13:16 GMT+01:00 Mark Thomas :

> On 03/11/2015 11:36, Roel Storms wrote:
> > Hello,
> >
> >
> > I was wondering if anything special is done with cookie based session
> > management in order for it to deal with HTTP pipelining.
>
> No.
>
> 
>
> > There are of course different scenario's that can be drawn but is there a
> > way tomcat deals with this problem?
>
> No.
>
> > According to wikipedia, servers can
> > easily deal with the issue of pipelining but I believe that is not the
> case
> > when sessions are involved.
>
> Tomcat supports pipelining but makes no assumptions about sessions. Keep
> in mind that a proxy may be pipelining requests from different clients.
>
> > Is this scenario realistic?
>
> Yes.
>
> > Is it possible that two sessions exist where
> > the information in the first session will be lost?
>
> Yes, one of those sessions is going to be lost.
>
> > I know by default most browsers turn pipelining off because of a lot of
> > proxies and servers not supporting it. Is this one of the reasons?
>
> Supporting pipelining is a spec requirement so I'd be surprised if it
> wasn't supported.
>

I found this for the Chrome project:
https://www.chromium.org/developers/design-documents/network-stack/http-pipelining
No clue if other support it or not but if chrome an IE don't support I
assume there
are many others as well. I found that safari has support for pipelining as
does Firefox
but it's not enabled by default in FF.

>
> Session handling is certainly one reason not to use pipelining.
>
> 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.1

[Rémy Maucherat]

2015-11-03 21:14 GMT+01:00 Christopher Schultz :

> Fixing the APR path allows tcnative to build without warnings or errors.
> It even links against libssl, even though the configure script really
> wants to have OpenSSL 1.0.2 and I only have 1.0.1. I'm curious to see
> what happens when I run it.
>
> Since there are issues that are being investigated, it would be best to
focus exclusively on OpenSSL 1.0.2d (that's a requirement for ALPN and
HTTP/2 support, so it's *really* a requirement for using tcnative 1.2,
there's no point in this release without it) and not test anything else to
avoid running into other errors that could confuse everyone.

Rémy

mod_jk 1.2.40, Apache 2.4.x and ForwardURICompatUnparsed

[Henri Gomez]

Hi all

When I upgraded some HTTPd instance from 2.2 to 2.4, I got errors with
some VHost using

AllowEncodedSlashes On
JkOptions +ForwardURICompatUnparsed

This is what I should define to avoid Jenkins complain about invalid
configuration.

Error report is 500 and jk log report

jk_handler::mod_jk.c (2765): Could not init service for worker=myworker

Did some of you get same problem with ForwardURICompatUnparsed or
JkOptions on HTTPd 2.4.x ?

Thanks

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

[Christopher Schultz]

Rainer,

On 11/3/15 12:36 PM, Rainer Jung wrote:
> Am 03.11.2015 um 17:18 schrieb Christopher Schultz:
>> Mark,
>>
>> On 11/2/15 4:04 PM, Mark Thomas wrote:
>>> Version 1.2.1 includes the following changes:
>>> - Fix to enable 1.2.x to work with Tomcat releases that do not have
>>>the SNI callback implemented on the Java side
>>>
>>> The proposed release artefacts can be found at [1],
>>> and the build was done using tag [2].
>>>
>>> The Apache Tomcat Native 1.2.1 is
>>>   [ ] Stable, go ahead and release
>>>   [ ] Broken because of ...
>>>
>>>
>>> [1]
>>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.1/
>>>
>>> [2]
>>> https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_1
>>
>> I don't have OpenSSL 1.0.2 on one of my Linux servers, and I get this
>> result:
>>
>> $ ./configure --with-apr=../../apr-1.4.6 --with-ssl
>> checking build system type... x86_64-unknown-linux-gnu
>> checking host system type... x86_64-unknown-linux-gnu
>> checking target system type... x86_64-unknown-linux-gnu
>> checking for a BSD-compatible install... /usr/bin/install -c
>> checking for working mkdir -p... yes
>> Tomcat Native Version: 1.2.1
>> checking for chosen layout... tcnative
>> checking for APR... yes
>> configure: APR 1.4.6 detected.
>> ./configure: line 2689: cd: /home/cschultz/projects/apr-1.4.6/build: No
> 
> We need to determine, where APR installed some build support files.
> configure does in line 2687
> 
> APR_BUILD_DIR="`$apr_config --installbuilddir`"
> 
> then cd to APR_BUILD_DIR and then pwd to get the dir path.
> 
> You might want to insert directly before line
> 
> 2687   APR_BUILD_DIR="`$apr_config --installbuilddir`"
> 
> an
> 
> echo $apr_config
> 
> to check, which apr_config was actually used, whether the one from the
> APR you wanted to use, or another one. Then you can run
> 
> apr_config --installbuilddir
> 
> by yourself using the same apr_config, that your echo gave and look into
> the directory, that is returned by that command. That directory must
> exist and there needs to be an apr_rules.mk file in that directory.

It looks like my apr directory didn't have all it needed. Using
--with-apr=`which apr-config` did the trick on my Debian Linux system. I
had been playing around with different APR versions a while back and it
looks like I selected the wrong one for the build.

Fixing the APR path allows tcnative to build without warnings or errors.
It even links against libssl, even though the configure script really
wants to have OpenSSL 1.0.2 and I only have 1.0.1. I'm curious to see
what happens when I run it.

>> such file or directory
>>setting CC to "gcc"
>>setting CPP to "gcc -E"
>>adding "-I/usr/local/java-8/include" to TCNATIVE_PRIV_INCLUDES
>> checking for JDK os include directory...  linux
>>adding "-I/usr/local/java-8/include/linux" to TCNATIVE_PRIV_INCLUDES
>> checking for gcc... gcc
>> checking whether the C compiler works... yes
>> checking for C compiler default output file name... a.out
>> checking for suffix of executables...
>> checking whether we are cross compiling... no
>> checking for suffix of object files... o
>> checking whether we are using the GNU C compiler... yes
>> checking whether gcc accepts -g... yes
>> checking for gcc option to accept ISO C89... none needed
>> checking for OpenSSL library... using openssl from /usr/lib and
>> /usr/include
>> checking OpenSSL library version >= 1.0.2...
>>
>> Found   OPENSSL_VERSION_NUMBER 0x1000105f (OpenSSL 1.0.1e 11 Feb 2013)
>> Require OPENSSL_VERSION_NUMBER 0x1000200f or greater (1.0.2)
>>
>> not compatible
>> checking for OpenSSL DSA support... yes
>>setting TCNATIVE_LDFLAGS to "-lssl -lcrypto"
>>adding "-DHAVE_OPENSSL" to CFLAGS
>>setting TCNATIVE_LIBS to ""
>>setting TCNATIVE_LIBS to "
>> /home/cschultz/projects/apr-1.4.6/libapr-1.la -luuid -lrt -lcrypt
>> -lpthread -ldl"
>> checking for apr_pollset_wakeup in -lapr-1... yes
>>adding "-DHAVE_POLLSET_WAKEUP" to CFLAGS
>> cp: cannot stat `/apr_rules.mk': No such file or directory
> 
> Same root cause as above.
> 
>> configure: creating ./config.status
>> config.status: creating tcnative.pc
>> config.status: creating Makefile
>> config.status: executing default commands
>> $ make
>> Makefile:47:
>> /home/cschultz/projects/apache/tomcat-native-1.2.1-src/native/build/rules.mk:
>>
>> No such file or directory
>> make: *** No rule to make target
>> `/home/cschultz/projects/apache/tomcat-native-1.2.1-src/native/build/rules.mk'.
>>
>>   Stop.
>>
>>
>> Presumably, this is due to the OpenSSL version problem, but configure
>> doesn't /appear/ to fail, and then make certainly does.
>>
>> On my OS X system (once I babied the CLI built-tools back into working
>> order -- SO frustrating every time Apple updates something and breaks it
>> all), the build was clean -- not even a compiler warning.
>>
>> I haven't tested it at all. Just the build on both systems.
> 
> The problem is due to some APR mismatch. 

[GitHub] tomcat pull request: Fixed UnsupportedOperationException when rele...

[ctalau]

GitHub user ctalau opened a pull request:

https://github.com/apache/tomcat/pull/23

Fixed UnsupportedOperationException when releasing an user-provided 
URLStreamHandlerFactory

CopyOnWriterArrayList iterator remove operation was invoked when
de-registering a user-provided URLStreamHandlerFactory.

I also added a test case for that.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/ctalau/tomcat trunk

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/23.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #23


commit 2cddeee1e24b88b76f84ebc457f35a6b3f84531a
Author: Cristian Talau 
Date:   2015-11-03T21:14:17Z

Fixed exception when releasing an user url factory

CopyOnWriterArrayList iterators remove operation was invoked when
de-registering a user-provided URLStreamHandlerFactory.




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[Christopher Schultz]

Mark,

On 11/2/15 4:04 PM, Mark Thomas wrote:
> Version 1.2.1 includes the following changes:
> - Fix to enable 1.2.x to work with Tomcat releases that do not have
>   the SNI callback implemented on the Java side
> 
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
> 
> The Apache Tomcat Native 1.2.1 is
>  [ ] Stable, go ahead and release
>  [ ] Broken because of ...
> 
> 
> [1]
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.1/
> [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_1

I'm unsure of how to interpret these unit test failures, so I'll just
report them and you can tell me if they can safely be ignored.

Environment: Tomcat 8.0.28, OpenSSL 1.0.1e (Debian, includes back-ported
security fixes), tcnative 1.2.1rc


org.apache.tomcat.util.net.TestSsl.APR.txt

Testcase: testKeyPass took 0.362 sec
Caused an ERROR
Unexpected end of file from server
java.net.SocketException: Unexpected end of file from server
at sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:792)
at sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:647)
at sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:789)
at sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:647)
at
sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1535)
at
sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1440)
at
java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:480)
at
sun.net.www.protocol.https.HttpsURLConnectionImpl.getResponseCode(HttpsURLConnectionImpl.java:338)
at
org.apache.catalina.startup.TomcatBaseTest.methodUrl(TomcatBaseTest.java:668)
at
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:640)
at
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:634)
at
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:623)
at
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:617)
at org.apache.tomcat.util.net.TestSsl.testKeyPass(TestSsl.java:87)

Testcase: testRenegotiateWorks took 0.012 sec
SKIPPED: SSL renegotiation has to be supported for this test


org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.APR.txt

Testcase: testBug56032 took 83.172 sec
FAILED
No error reported by Endpoint when timeout was expected
junit.framework.AssertionFailedError: No error reported by Endpoint when
timeout was expected
at
org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.testBug56032(TestWebSocketFrameClientSSL.java:142)

Testcase: testConnectToServerEndpoint took 0.275 sec
Caused an ERROR
The HTTP request to initiate the WebSocket connection failed
javax.websocket.DeploymentException: The HTTP request to initiate the
WebSocket connection failed
at
org.apache.tomcat.websocket.WsWebSocketContainer.connectToServer(WsWebSocketContainer.java:364)
at
org.apache.tomcat.websocket.WsWebSocketContainer.connectToServer(WsWebSocketContainer.java:204)
at
org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.testConnectToServerEndpoint(TestWebSocketFrameClientSSL.java:66)
Caused by: java.util.concurrent.ExecutionException:
java.lang.IllegalStateException: Unexpected Status of SSLEngineResult
after an unwrap() operation
at
org.apache.tomcat.websocket.AsyncChannelWrapperSecure$WrapperFuture.get(AsyncChannelWrapperSecure.java:508)
at
org.apache.tomcat.websocket.WsWebSocketContainer.processResponse(WsWebSocketContainer.java:607)
at
org.apache.tomcat.websocket.WsWebSocketContainer.connectToServer(WsWebSocketContainer.java:316)
Caused by: java.lang.IllegalStateException: Unexpected Status of
SSLEngineResult after an unwrap() operation
at
org.apache.tomcat.websocket.AsyncChannelWrapperSecure$ReadTask.run(AsyncChannelWrapperSecure.java:313)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)


org.apache.tomcat.websocket.TestWsWebSocketContainer.APR.txt


Testcase: testConnectToServerEndpointSSL took 1.135 sec
Caused an ERROR
The HTTP request to initiate the WebSocket connection failed
javax.websocket.DeploymentException: The HTTP request to initiate the
WebSocket connection failed
at

svn commit: r1712443 - /tomcat/native/trunk/native/src/sslnetwork.c

[markt]

Author: markt
Date: Tue Nov  3 23:34:57 2015
New Revision: 1712443

URL: http://svn.apache.org/viewvc?rev=1712443=rev
Log:
Forward port of r1456353 (mturk) from 1.1.x
Prevent infinite loop for SSL_ERROR_SSL

Modified:
tomcat/native/trunk/native/src/sslnetwork.c

Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1712443=1712442=1712443=diff
==
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Tue Nov  3 23:34:57 2015
@@ -524,6 +524,9 @@ ssl_socket_send(apr_socket_t *sock, cons
 con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
 return rv;
 break;
+case SSL_ERROR_SSL:
+/* Probably caused by buffer missmatch */
+rv = APR_EINVAL;
 case SSL_ERROR_ZERO_RETURN:
 if (s == 0) {
 con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;



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

Tomcat Native 1.2.2

[Mark Thomas]

I've just finished running the unit tests for APR on OSX with the
current 1.2.x trunk and 9.0.x, 8.0.x and 7.0.x and all pass.

I plan to tag 1.2.2 tomorrow morning and will hopefully be able to start
a new vote later in the day.

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

[Mark Thomas]

On 02/11/2015 21:04, Mark Thomas wrote:
> Version 1.2.1 includes the following changes:
> - Fix to enable 1.2.x to work with Tomcat releases that do not have
>   the SNI callback implemented on the Java side
> 
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
> 
> The Apache Tomcat Native 1.2.1 is
>  [ ] Stable, go ahead and release
>  [X] Broken because of ...

Unit test failures with native 1.2.1 + OpenSSL 1.0.2d

I've tracked these down to some missing fixes in the 1.1.x to trunk
ports for sslnetwork.c. At least, I've ported one missing patch and at
least some of the failing unit tests now pass.

I will commit the first fix for this shortly. Anything I commit will
compile but it might not be stable.

Mark

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

svn commit: r1712444 - /tomcat/native/trunk/native/src/sslnetwork.c

[markt]

Author: markt
Date: Tue Nov  3 23:43:10 2015
New Revision: 1712444

URL: http://svn.apache.org/viewvc?rev=1712444=rev
Log:
The changes in r1712437 made this code unnecessary

Modified:
tomcat/native/trunk/native/src/sslnetwork.c

Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1712444=1712443=1712444=diff
==
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Tue Nov  3 23:43:10 2015
@@ -395,7 +395,6 @@ ssl_socket_recv(apr_socket_t *sock, char
 int s, i, rd = (int)(*len);
 apr_status_t rv;
 apr_interval_time_t timeout;
-apr_int32_t nb;
 
 *len = 0;
 if (con->reneg_state == RENEG_ABORT) {
@@ -403,7 +402,6 @@ ssl_socket_recv(apr_socket_t *sock, char
 return APR_ECONNABORTED;
 }
 apr_socket_timeout_get(con->sock, );
-apr_socket_opt_get(con->sock, APR_SO_NONBLOCK, );
 for (;;) {
 ERR_clear_error();
 if ((s = SSL_read(con->ssl, buf, rd)) <= 0) {
@@ -419,15 +417,6 @@ ssl_socket_recv(apr_socket_t *sock, char
 switch (i) {
 case SSL_ERROR_WANT_READ:
 case SSL_ERROR_WANT_WRITE:
-if (nb) {
-if (i == SSL_ERROR_WANT_READ) {
-*len = 0;
-return APR_SUCCESS;
-} else {
-con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
-return rv;
-}
-}
 if ((rv = wait_for_io_or_timeout(con, i, timeout)) != 
APR_SUCCESS) {
 con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
 return rv;



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

svn commit: r1712451 - in /tomcat/tc7.0.x/trunk: build.properties.default build.xml

[markt]

Author: markt
Date: Wed Nov  4 00:56:53 2015
New Revision: 1712451

URL: http://svn.apache.org/viewvc?rev=1712451=rev
Log:
Add an option the build to set java.net.preferIPv4Stack=true when running tests.
This appears to be required on OSX El Capitan for multicast to work with the 
current tests

Modified:
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1712451=1712450=1712451=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Wed Nov  4 00:56:53 2015
@@ -44,6 +44,10 @@ test.accesslog=false
 # Note the Cobertura code coverage tool is GPLv2 licensed
 test.cobertura=false
 
+# Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
+# multicast tests to work
+#java.net.preferIPv4Stack=true
+
 # Location of Java7 JDK
 #java.7.home=/path/to/java7/jdk
 

Modified: tomcat/tc7.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1712451=1712450=1712451=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Wed Nov  4 00:56:53 2015
@@ -1427,6 +1427,7 @@
 
 
 
+
 
 
 



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

svn commit: r1712437 - /tomcat/native/trunk/native/src/sslnetwork.c

[markt]

Author: markt
Date: Tue Nov  3 23:21:20 2015
New Revision: 1712437

URL: http://svn.apache.org/viewvc?rev=1712437=rev
Log:
Forward port of r1409681 (mturk) from 1.1.x
Clean up SSL network layer. Ensure the behavior is similar to standard APR layer

Modified:
tomcat/native/trunk/native/src/sslnetwork.c

Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1712437=1712436=1712437=diff
==
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Tue Nov  3 23:21:20 2015
@@ -169,9 +169,9 @@ static tcn_ssl_conn_t *ssl_create(JNIEnv
 #endif
 
 static apr_status_t wait_for_io_or_timeout(tcn_ssl_conn_t *con,
-   int for_what)
+   int for_what,
+   apr_interval_time_t timeout)
 {
-apr_interval_time_t timeout;
 apr_pollfd_t pfd;
 int type;
 apr_status_t status;
@@ -206,8 +206,11 @@ static apr_status_t wait_for_io_or_timeo
 return APR_EINVAL;
 break;
 }
-
-apr_socket_timeout_get(con->sock, );
+if (timeout <= 0) {
+/* Waiting on zero or infinite timeouts is not allowed
+ */
+return APR_EAGAIN;
+}
 pfd.desc_type = APR_POLL_SOCKET;
 pfd.desc.s= con->sock;
 pfd.reqevents = type;
@@ -305,6 +308,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, hand
 {
 tcn_socket_t *ss = J2P(sock, tcn_socket_t *);
 tcn_ssl_conn_t *con;
+apr_interval_time_t timeout;
 int s, i;
 long vr;
 apr_status_t rv;
@@ -315,11 +319,14 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, hand
 if (ss->net->type != TCN_SOCKET_SSL)
 return APR_EINVAL;
 con = (tcn_ssl_conn_t *)ss->opaque;
+
+apr_socket_timeout_get(con->sock, );
 while (!SSL_is_init_finished(con->ssl)) {
+ERR_clear_error();
 if ((s = SSL_do_handshake(con->ssl)) <= 0) {
-apr_status_t os = apr_get_netos_error();
 if (!con->ssl)
-return os == APR_SUCCESS ? APR_ENOTSOCK : os;
+return APR_ENOTSOCK;
+rv = apr_get_netos_error();
 i = SSL_get_error(con->ssl, s);
 switch (i) {
 case SSL_ERROR_NONE:
@@ -328,20 +335,19 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, hand
 break;
 case SSL_ERROR_WANT_READ:
 case SSL_ERROR_WANT_WRITE:
-if ((rv = wait_for_io_or_timeout(con, i)) != APR_SUCCESS) {
+if ((rv = wait_for_io_or_timeout(con, i, timeout)) != 
APR_SUCCESS) {
 con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
 return rv;
 }
 break;
 case SSL_ERROR_SYSCALL:
-case SSL_ERROR_SSL:
-if (!APR_STATUS_IS_EAGAIN(os) &&
-!APR_STATUS_IS_EINTR(os)) {
-con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
-ERR_print_errors(con->ctx->bio_os);
-return os == APR_SUCCESS ? APR_EGENERAL : os;
+#if !defined(_WIN32)
+if (APR_STATUS_IS_EINTR(rv)) {
+/* Interrupted by signal */
+continue;
 }
-break;
+#endif
+/* Fall through */
 default:
 /*
 * Anything else is a fatal error
@@ -388,34 +394,31 @@ static apr_status_t APR_THREAD_FUNC
 ssl_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
 {
 tcn_ssl_conn_t *con = (tcn_ssl_conn_t *)sock;
-int s, i, wr = (int)(*len);
-apr_status_t rv = APR_SUCCESS;
+int s, i, rd = (int)(*len);
+apr_status_t rv;
+apr_interval_time_t timeout;
 apr_int32_t nb;
 
+*len = 0;
 if (con->reneg_state == RENEG_ABORT) {
-*len = 0;
 con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
 return APR_ECONNABORTED;
 }
+apr_socket_timeout_get(con->sock, );
 apr_socket_opt_get(con->sock, APR_SO_NONBLOCK, );
 for (;;) {
-if ((s = SSL_read(con->ssl, buf, wr)) <= 0) {
-apr_status_t os = apr_get_netos_error();
+ERR_clear_error();
+if ((s = SSL_read(con->ssl, buf, rd)) <= 0) {
 if (!con->ssl)
-return os == APR_SUCCESS ? APR_ENOTSOCK : os;
-
+return APR_ENOTSOCK;
+rv = apr_get_netos_error();
 i = SSL_get_error(con->ssl, s);
 /* Special case if the "close notify" alert send by peer */
 if (s == 0 && (SSL_get_shutdown(con->ssl) & 
SSL_RECEIVED_SHUTDOWN)) {
-*len = 0;
+con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
 return 

svn commit: r1712441 - /tomcat/native/branches/1.1.x/native/src/sslnetwork.c

[markt]

Author: markt
Date: Tue Nov  3 23:31:25 2015
New Revision: 1712441

URL: http://svn.apache.org/viewvc?rev=1712441=rev
Log:
Whitespace / typo fixes to align with trunk to aid diffs

Modified:
tomcat/native/branches/1.1.x/native/src/sslnetwork.c

Modified: tomcat/native/branches/1.1.x/native/src/sslnetwork.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslnetwork.c?rev=1712441=1712440=1712441=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslnetwork.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslnetwork.c Tue Nov  3 23:31:25 
2015
@@ -322,7 +322,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, hand
 if (!con->ssl)
 return APR_ENOTSOCK;
 rv = apr_get_netos_error();
-i  = SSL_get_error(con->ssl, s);
+i = SSL_get_error(con->ssl, s);
 switch (i) {
 case SSL_ERROR_NONE:
 con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
@@ -337,12 +337,12 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, hand
 break;
 case SSL_ERROR_SYSCALL:
 #if !defined(_WIN32)
-  if (APR_STATUS_IS_EINTR(rv)) {
-  /* Interrupted by signal */
-  continue;
-  }
+if (APR_STATUS_IS_EINTR(rv)) {
+/* Interrupted by signal */
+continue;
+}
 #endif
-/* Fall trough */
+/* Fall through */
 default:
 /*
  * Anything else is a fatal error
@@ -402,8 +402,8 @@ ssl_socket_recv(apr_socket_t *sock, char
 if ((s = SSL_read(con->ssl, buf, rd)) <= 0) {
 if (!con->ssl)
 return APR_ENOTSOCK;
-rv  = apr_get_netos_error();
-i   = SSL_get_error(con->ssl, s);
+rv = apr_get_netos_error();
+i = SSL_get_error(con->ssl, s);
 /* Special case if the "close notify" alert send by peer */
 if (s == 0 && (SSL_get_shutdown(con->ssl) & 
SSL_RECEIVED_SHUTDOWN)) {
 con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
@@ -429,13 +429,13 @@ ssl_socket_recv(apr_socket_t *sock, char
 continue;
 }
 #endif
-/* Fall trough */
+/* Fall through */
 case SSL_ERROR_ZERO_RETURN:
 if (s == 0) {
 con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
 return APR_EOF;
 }
-/* Fall trough */
+/* Fall through */
 default:
 con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
 return APR_EGENERAL;
@@ -466,7 +466,7 @@ ssl_socket_send(apr_socket_t *sock, cons
 return APR_ECONNABORTED;
 }
 if (!SSL_is_init_finished(con->ssl)) {
-/* XXX: Is this a correct retval ? */ 
+/* XXX: Is this a correct retval ? */
 return APR_EINPROGRESS;
 }
 if (wr == 0) {
@@ -481,8 +481,8 @@ ssl_socket_send(apr_socket_t *sock, cons
 if ((s = SSL_write(con->ssl, buf, wr)) <= 0) {
 if (!con->ssl)
 return APR_ENOTSOCK;
-rv  = apr_get_netos_error();
-i   = SSL_get_error(con->ssl, s);
+rv = apr_get_netos_error();
+i = SSL_get_error(con->ssl, s);
 switch (i) {
 case SSL_ERROR_WANT_READ:
 case SSL_ERROR_WANT_WRITE:
@@ -516,7 +516,7 @@ ssl_socket_send(apr_socket_t *sock, cons
 con->shutdown_type = SSL_SHUTDOWN_TYPE_STANDARD;
 return APR_EOF;
 }
-/* Fall trough */
+/* Fall through */
 default:
 con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
 return rv;



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

svn commit: r1712442 - /tomcat/native/trunk/native/src/sslnetwork.c

[markt]

Author: markt
Date: Tue Nov  3 23:31:58 2015
New Revision: 1712442

URL: http://svn.apache.org/viewvc?rev=1712442=rev
Log:
Whitespace fixes to align with 1.1.x to aid diffs

Modified:
tomcat/native/trunk/native/src/sslnetwork.c

Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1712442=1712441=1712442=diff
==
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Tue Nov  3 23:31:58 2015
@@ -154,8 +154,6 @@ static tcn_ssl_conn_t *ssl_create(JNIEnv
 SSL_set_verify_result(ssl, X509_V_OK);
 SSL_rand_seed(ctx->rand_file);
 
-//SSL_set_session_ticket_ext_cb(ssl, ssl_ticket_cb, con);
-
 #ifdef TCN_DO_STATISTICS
 ssl_created++;
 #endif
@@ -350,8 +348,8 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, hand
 /* Fall through */
 default:
 /*
-* Anything else is a fatal error
-*/
+ * Anything else is a fatal error
+ */
 con->shutdown_type = SSL_SHUTDOWN_TYPE_UNCLEAN;
 return SSL_TO_APR_ERROR(i);
 break;
@@ -499,7 +497,7 @@ ssl_socket_send(apr_socket_t *sock, cons
 if ((s = SSL_write(con->ssl, buf, wr)) <= 0) {
 if (!con->ssl)
 return APR_ENOTSOCK;
-rv  = apr_get_netos_error();
+rv = apr_get_netos_error();
 i = SSL_get_error(con->ssl, s);
 switch (i) {
 case SSL_ERROR_WANT_READ:



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

svn commit: r1712457 - in /tomcat/native/trunk/native/src: ssl.c sslnetwork.c sslutils.c

[billbarker]

Author: billbarker
Date: Wed Nov  4 02:25:05 2015
New Revision: 1712457

URL: http://svn.apache.org/viewvc?rev=1712457=rev
Log:
Forward port r1712199 align with OpenSSL master. Just deleted the SSLeay check 
since any OS I know will raise an UnsatifiedLinkError if you try to load this 
with such an old version when 1.0.2x is required. Otherwise no change if 
compiling against 1.0.2x

Modified:
tomcat/native/trunk/native/src/ssl.c
tomcat/native/trunk/native/src/sslnetwork.c
tomcat/native/trunk/native/src/sslutils.c

Modified: tomcat/native/trunk/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1712457=1712456=1712457=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Nov  4 02:25:05 2015
@@ -657,12 +657,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize
 TCN_FREE_CSTRING(engine);
 return (jint)APR_SUCCESS;
 }
-if (SSLeay() < 0x0090700L) {
-TCN_FREE_CSTRING(engine);
-tcn_ThrowAPRException(e, APR_EINVAL);
-ssl_initialized = 0;
-return (jint)APR_EINVAL;
-}
+
 /* We must register the library in full, to ensure our configuration
  * code can successfully test the SSL environment.
  */

Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1712457=1712456=1712457=diff
==
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Wed Nov  4 02:25:05 2015
@@ -650,6 +650,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
 #endif
 return APR_EGENERAL;
 }
+#if OPENSSL_VERSION_NUMBER < 0x1010L
 SSL_set_state(con->ssl, SSL_ST_ACCEPT);
 
 apr_socket_timeout_get(con->sock, );
@@ -669,14 +670,11 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, rene
 break;
 }
 con->reneg_state = RENEG_REJECT;
-#if OPENSSL_VERSION_NUMBER < 0x1010L
+
 if (SSL_get_state(con->ssl) != SSL_ST_OK) {
-#else
-if (SSL_get_state(con->ssl) != TLS_ST_OK) {
-#endif
 return APR_EGENERAL;
 }
-
+#endif
 return APR_SUCCESS;
 }
 

Modified: tomcat/native/trunk/native/src/sslutils.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1712457=1712456=1712457=diff
==
--- tomcat/native/trunk/native/src/sslutils.c (original)
+++ tomcat/native/trunk/native/src/sslutils.c Wed Nov  4 02:25:05 2015
@@ -246,7 +246,11 @@ int SSL_CTX_use_certificate_chain(SSL_CT
 unsigned long err;
 int n;
 
+#if OPENSSL_VERSION_NUMBER < 0x1010L
 if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
+#else
+if ((bio = BIO_new(BIO_s_file())) == NULL)
+#endif
 return -1;
 if (BIO_read_filename(bio, file) <= 0) {
 BIO_free(bio);
@@ -548,9 +552,11 @@ void SSL_callback_handshake(const SSL *s
 if ((where & SSL_CB_ACCEPT_LOOP) && con->reneg_state == RENEG_REJECT) {
 int state = SSL_get_state(ssl);
 
-if (state == SSL3_ST_SR_CLNT_HELLO_A
 #if OPENSSL_VERSION_NUMBER < 0x1010L
+if (state == SSL3_ST_SR_CLNT_HELLO_A
 || state == SSL23_ST_SR_CLNT_HELLO_A
+#else
+if (state == TLS_ST_SR_CLNT_HELLO
 #endif
 ) {
 con->reneg_state = RENEG_ABORT;



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

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) 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-tc8.0.x-test-apr has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc8.0.x-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-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-8.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 38 mins 4 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-20151104-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/dest-20151104/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151104.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151104-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-1.0.2/dest-20151104/bin/openssl
 -Dexecute.test.bio=false -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-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 

svn commit: r1712476 - in /tomcat/native/trunk: native/src/ssl.c xdocs/miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Wed Nov  4 06:33:56 2015
New Revision: 1712476

URL: http://svn.apache.org/viewvc?rev=1712476=rev
Log:
Fix "error: 'ctx' undeclared" in maintainer mode
or when DEBUG is defined.

Modified:
tomcat/native/trunk/native/src/ssl.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/trunk/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1712476=1712475=1712476=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Nov  4 06:33:56 2015
@@ -1549,7 +1549,11 @@ TCN_IMPLEMENT_CALL(void, SSL, setVerify)
 verify = SSL_VERIFY_NONE;
 
 UNREFERENCED(o);
-TCN_ASSERT(ctx != 0);
+
+if (c == NULL) {
+tcn_ThrowException(e, "context is null");
+return;
+}
 c->verify_mode = level;
 
 if (c->verify_mode == SSL_CVERIFY_UNSET)

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1712476=1712475=1712476=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Nov  4 06:33:56 
2015
@@ -34,6 +34,13 @@
   This is the Changelog for Tomcat Native 1.2.
   
 
+
+  
+
+  Fix broken debug and maintainer mode build. (rjung)
+
+  
+
 
   
 



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

websocket tomcat listener API?

[Romain Manni-Bucau]

Hi guys,

Would it be possible to add to tomcat codebase a way to register custom
websocket lifecycle listeners for technical integration. For instance in
TomEE we would need a clean way to listen for close() or timeout() without
modifying the user code side if possible.

wdyt?

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Github  |
LinkedIn  | Tomitriber

[GitHub] tomcat pull request:

[nitincchauhan]

Github user nitincchauhan commented on the pull request:


https://github.com/apache/tomcat/commit/241f5e745a292a409d84eef39afd024f46cb3691#commitcomment-14154669
  
In test/org/apache/catalina/authenticator/TestDigestAuthenticator.java:
In test/org/apache/catalina/authenticator/TestDigestAuthenticator.java on 
line 316:
BUG must be index of double quote


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[GitHub] tomcat pull request:

[nitincchauhan]

Github user nitincchauhan commented on the pull request:


https://github.com/apache/tomcat/commit/241f5e745a292a409d84eef39afd024f46cb3691#commitcomment-14154678
  
In 
test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java:
In 
test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java on 
line 318:
BUG must be index of double quote


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[GitHub] tomcat pull request:

[nitincchauhan]

Github user nitincchauhan commented on the pull request:


https://github.com/apache/tomcat/commit/241f5e745a292a409d84eef39afd024f46cb3691#commitcomment-14154687
  
In 
test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java:
In 
test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java on 
line 329:
BUG must be index of double quote


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[GitHub] tomcat pull request:

[nitincchauhan]

Github user nitincchauhan commented on the pull request:


https://github.com/apache/tomcat/commit/241f5e745a292a409d84eef39afd024f46cb3691#commitcomment-14154660
  
In test/org/apache/catalina/authenticator/TestDigestAuthenticator.java:
In test/org/apache/catalina/authenticator/TestDigestAuthenticator.java on 
line 305:
BUG must be index of double quote


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[Christopher Schultz]

Mark,

On 11/2/15 4:04 PM, Mark Thomas wrote:
> Version 1.2.1 includes the following changes:
> - Fix to enable 1.2.x to work with Tomcat releases that do not have
>   the SNI callback implemented on the Java side
> 
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
> 
> The Apache Tomcat Native 1.2.1 is
>  [ ] Stable, go ahead and release
>  [ ] Broken because of ...
> 
> 
> [1]
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.1/
> [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_1

I don't have OpenSSL 1.0.2 on one of my Linux servers, and I get this
result:

$ ./configure --with-apr=../../apr-1.4.6 --with-ssl
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking target system type... x86_64-unknown-linux-gnu
checking for a BSD-compatible install... /usr/bin/install -c
checking for working mkdir -p... yes
Tomcat Native Version: 1.2.1
checking for chosen layout... tcnative
checking for APR... yes
configure: APR 1.4.6 detected.
./configure: line 2689: cd: /home/cschultz/projects/apr-1.4.6/build: No
such file or directory
  setting CC to "gcc"
  setting CPP to "gcc -E"
  adding "-I/usr/local/java-8/include" to TCNATIVE_PRIV_INCLUDES
checking for JDK os include directory...  linux
  adding "-I/usr/local/java-8/include/linux" to TCNATIVE_PRIV_INCLUDES
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking for OpenSSL library... using openssl from /usr/lib and /usr/include
checking OpenSSL library version >= 1.0.2...

Found   OPENSSL_VERSION_NUMBER 0x1000105f (OpenSSL 1.0.1e 11 Feb 2013)
Require OPENSSL_VERSION_NUMBER 0x1000200f or greater (1.0.2)

not compatible
checking for OpenSSL DSA support... yes
  setting TCNATIVE_LDFLAGS to "-lssl -lcrypto"
  adding "-DHAVE_OPENSSL" to CFLAGS
  setting TCNATIVE_LIBS to ""
  setting TCNATIVE_LIBS to "
/home/cschultz/projects/apr-1.4.6/libapr-1.la -luuid -lrt -lcrypt
-lpthread -ldl"
checking for apr_pollset_wakeup in -lapr-1... yes
  adding "-DHAVE_POLLSET_WAKEUP" to CFLAGS
cp: cannot stat `/apr_rules.mk': No such file or directory
configure: creating ./config.status
config.status: creating tcnative.pc
config.status: creating Makefile
config.status: executing default commands
$ make
Makefile:47:
/home/cschultz/projects/apache/tomcat-native-1.2.1-src/native/build/rules.mk:
No such file or directory
make: *** No rule to make target
`/home/cschultz/projects/apache/tomcat-native-1.2.1-src/native/build/rules.mk'.
 Stop.


Presumably, this is due to the OpenSSL version problem, but configure
doesn't /appear/ to fail, and then make certainly does.

On my OS X system (once I babied the CLI built-tools back into working
order -- SO frustrating every time Apple updates something and breaks it
all), the build was clean -- not even a compiler warning.

I haven't tested it at all. Just the build on both systems.

-chris

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

[Rainer Jung]

Am 03.11.2015 um 13:31 schrieb Konstantin Kolinko:

2015-11-03 0:04 GMT+03:00 Mark Thomas :

Version 1.2.1 includes the following changes:
- Fix to enable 1.2.x to work with Tomcat releases that do not have
   the SNI callback implemented on the Java side

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.1 is
  [ ] Stable, go ahead and release
  [ ] Broken because of ...



Interim results.  Testing 7.0.x (@r1712220) with Java 8u66 (32-bit)

[concat] Testsuites with failed tests:
[concat] 
TEST-org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.APR.txt
[concat] 
TEST-org.apache.catalina.authenticator.TestSSOnonLoginAndBasicAuthenticator.APR.txt
[concat] 
TEST-org.apache.catalina.authenticator.TestSSOnonLoginAndDigestAuthenticator.APR.txt
[concat] 
TEST-org.apache.tomcat.websocket.TestWebSocketFrameClientSSL.APR.txt
[concat] TEST-org.apache.tomcat.websocket.TestWsWebSocketContainer.APR.txt

1) All 3 authenticator tests are failing in an odd way:

I guess that there is a change in Java 8 HttpURLConnection so that
tests in Tomcat 7 became incorrect.

IIRC somebody mentioned that there is some security feature protecting
access tor request headers, and it can be turned off by some option.

Testcase: testBasicLoginRejectProtectedWithSession took 0,265 sec
 Caused an ERROR
Illegal character(s) in message header field: Cookie:
java.lang.IllegalArgumentException: Illegal character(s) in message
header field: Cookie:
 at 
sun.net.www.protocol.http.HttpURLConnection.checkMessageHeader(HttpURLConnection.java:489)
 at 
sun.net.www.protocol.http.HttpURLConnection.isExternalMessageHeaderAllowed(HttpURLConnection.java:459)
 at 
sun.net.www.protocol.http.HttpURLConnection.setRequestProperty(HttpURLConnection.java:3018)
 at 
org.apache.catalina.startup.TomcatBaseTest.methodUrl(TomcatBaseTest.java:648)
 at 
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:625)
 at 
org.apache.catalina.startup.TomcatBaseTest.getUrl(TomcatBaseTest.java:619)
 at 
org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.doTestNonLogin(TestNonLoginAndBasicAuthenticator.java:419)
 at 
org.apache.catalina.authenticator.TestNonLoginAndBasicAuthenticator.testBasicLoginRejectProtectedWithSession(TestNonLoginAndBasicAuthenticator.java:401)


The message "Illegal character(s) in message header field" is thrown in 
Java 8 if the header names contains a line feed "\n". Problems with the 
header value would be signaled with "header value" not "header field".


So you might be able to debug into the problem by looking at 
TomcatBaseTest.methodUrl(), especially the keys of reqHead.entrySet().


Regards,

Rainer


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

[GitHub] tomcat pull request:

[violetagg]

Github user violetagg commented on the pull request:


https://github.com/apache/tomcat/commit/241f5e745a292a409d84eef39afd024f46cb3691#commitcomment-14154865
  
In 
test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java:
In 
test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java on 
line 329:
It is fixed with next commits.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[GitHub] tomcat pull request:

[violetagg]

Github user violetagg commented on the pull request:


https://github.com/apache/tomcat/commit/241f5e745a292a409d84eef39afd024f46cb3691#commitcomment-14154856
  
In test/org/apache/catalina/authenticator/TestDigestAuthenticator.java:
In test/org/apache/catalina/authenticator/TestDigestAuthenticator.java on 
line 305:
It is fixed with next commits.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[GitHub] tomcat pull request:

[violetagg]

Github user violetagg commented on the pull request:


https://github.com/apache/tomcat/commit/241f5e745a292a409d84eef39afd024f46cb3691#commitcomment-14154860
  
In test/org/apache/catalina/authenticator/TestDigestAuthenticator.java:
In test/org/apache/catalina/authenticator/TestDigestAuthenticator.java on 
line 316:
It is fixed with next commits.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

[GitHub] tomcat pull request:

[violetagg]

Github user violetagg commented on the pull request:


https://github.com/apache/tomcat/commit/241f5e745a292a409d84eef39afd024f46cb3691#commitcomment-14154864
  
In 
test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java:
In 
test/org/apache/catalina/authenticator/TestJaspicDigestAuthenticator.java on 
line 318:
It is fixed with next commits.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

Re: svn commit: r1712231 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Mark Thomas]

On 03/11/2015 09:57, Konstantin Kolinko wrote:
> 2015-11-03 12:27 GMT+03:00  :
>> Author: markt
>> Date: Tue Nov  3 09:27:07 2015
>> New Revision: 1712231
>>
>> URL: http://svn.apache.org/viewvc?rev=1712231=rev
>> Log:
>> Vote
>>
>> Modified:
>> tomcat/tc6.0.x/trunk/STATUS.txt
>>
>> Modified: tomcat/tc6.0.x/trunk/STATUS.txt
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1712231=1712230=1712231=diff
>> ==
>> --- tomcat/tc6.0.x/trunk/STATUS.txt (original)
>> +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 09:27:07 2015
>> @@ -42,7 +42,7 @@ PATCHES PROPOSED TO BACKPORT:
>>https://svn.apache.org/r1707054
>>- to be applied to extras.xml line 220
>>+1: kkolinko
>> -  -1:
>> +  -1: markt - This appears to be unnecessary
> 
> 
> Why unnecessary?
> 
> In 6.0.44 in /v6.0.44/bin/extras/tomcat-juli-adapters.jar  the
> LogFactoryImpl.class is excluded, but LogFactoryImpl$1.class,
> LogFactoryImpl$2.class, LogFactoryImpl$3.class  are still present.

I missed that there were inner classes. Consider my -1 withdrawn.

Mark


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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/550

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1712233
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

Re: svn commit: r1712231 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Mark Thomas]

On 03/11/2015 10:28, Rémy Maucherat wrote:
> 2015-11-03 11:02 GMT+01:00 Mark Thomas :
> 
>> I missed that there were inner classes. Consider my -1 withdrawn.
>>
> But didn't we just switch to CTR ?

We did. I was just adding a comment I had forgotten to on an open
proposal so it didn't get lost when the STATUS file is removed.

Mark


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

svn commit: r1712254 - in /tomcat/trunk/webapps/docs/config: ajp.xml http.xml

[markt]

Author: markt
Date: Tue Nov  3 11:15:20 2015
New Revision: 1712254

URL: http://svn.apache.org/viewvc?rev=1712254=rev
Log:
Add a note to maxPostSize suggested by Christopher Simons

Modified:
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml

Modified: tomcat/trunk/webapps/docs/config/ajp.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1712254=1712253=1712254=diff
==
--- tomcat/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/trunk/webapps/docs/config/ajp.xml Tue Nov  3 11:15:20 2015
@@ -113,8 +113,10 @@
 
   The maximum size in bytes of the POST which will be handled by
   the container FORM URL parameter parsing. The limit can be disabled by
-  setting this attribute to a value less than zero.
-  If not specified, this attribute is set to 2097152 (2 megabytes).
+  setting this attribute to a value less than zero. If not specified, this
+  attribute is set to 2097152 (2 megabytes). Note that the
+  FailedRequestFilter
+  can be used to reject requests that exceed this limit.
 
 
 

Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1712254=1712253=1712254=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Tue Nov  3 11:15:20 2015
@@ -122,8 +122,10 @@
 
   The maximum size in bytes of the POST which will be handled by
   the container FORM URL parameter parsing. The limit can be disabled by
-  setting this attribute to a value less than zero.
-  If not specified, this attribute is set to 2097152 (2 megabytes).
+  setting this attribute to a value less than zero. If not specified, this
+  attribute is set to 2097152 (2 megabytes). Note that the
+  FailedRequestFilter
+  can be used to reject requests that exceed this limit.
 
 
 



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