date:20120315

https://issues.apache.org/bugzilla/show_bug.cgi?id=52853

--- Comment #4 from Mark Thomas  2012-03-15 09:03:44 UTC ---
The simplest possible test case (as source code) that exhibits this issue would
be great. I can't stress the "simplest possible" bit enough. Based on the
description, I'd expect the simplest possible example to be a few small
classes. Ideally, you should based you test case on the Tomcat unit tests and
provide a diff against tomcat/trunk since that way the test can become part of
the standard test suite. Don't worry too much about what class you put the test
in. We'll move it if necessary.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52833] NPE with 7.0.26

https://issues.apache.org/bugzilla/show_bug.cgi?id=52833

--- Comment #7 from Mark Thomas  2012-03-15 09:10:52 UTC ---
I'm against the patch proposed since that addresses the symptom rather than the
cause. I'm not against added a null check that throws an IAE at the point where
the parent class loader is set to null, if you (as the user) would find that
useful. However, if you don't think it would be useful, there isn't much point
me adding it :)

All of this assumes that something in your code is setting the parent class
loader to null. If the root cause is something else then all bets are off and
we'll have to look at this aginan.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1300859 - /tomcat/tc7.0.x/trunk/

Author: markt
Date: Thu Mar 15 09:23:47 2012
New Revision: 1300859

URL: http://svn.apache.org/viewvc?rev=1300859&view=rev
Log:
Simplify merge info

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 09:23:47 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339
 
,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208
 
145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1
 
232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569
+/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-1178975,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303

svn commit: r1300863 - /tomcat/tc7.0.x/trunk/

Author: markt
Date: Thu Mar 15 09:39:16 2012
New Revision: 1300863

URL: http://svn.apache.org/viewvc?rev=1300863&view=rev
Log:
Simplify merge info

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 09:39:16 2012
@@ -1 +1 @@
-/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-1178975,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222
 
-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210
 
894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1
 
236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569
+/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-1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905

svn commit: r1300872 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/NioEndpoint.java test/org/apache/catalina/comet/TestCometProcessor.java test/org/apache/catalina/tribes/group/interc

Author: markt
Date: Thu Mar 15 09:55:14 2012
New Revision: 1300872

URL: http://svn.apache.org/viewvc?rev=1300872&view=rev
Log:
Merge some FindBugs fixes
Simplify merge info

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 09:55:14 2012
@@ -1 +1 @@
-/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-1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343
 
,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224
 
617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1
 
240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569
+/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,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,119730

[jira] [Created] (MTOMCAT-127) tomcat:run - Configuring Logging with JULI

2012-03-15 Thread Created

tomcat:run - Configuring Logging with JULI 
---

 Key: MTOMCAT-127
 URL: https://issues.apache.org/jira/browse/MTOMCAT-127
 Project: Apache Tomcat Maven Plugin
  Issue Type: New Feature
  Components: tomcat6, tomcat7
Affects Versions: 2.0
Reporter: Cédric Couralet
Assignee: Olivier Lamy
Priority: Minor


The configuration for a custom logging.properties is not taken into account 
with the tomcat6-7:run goal.
>From what I've seen, the reason is that the configuration for 
>java.util.logging is done before setting the system properties in the same 
>class loader.

I think it could be fixed by putting a call to 
LogManager.getLogManager().readConfiguration(); right after setting the system 
properties. I'm not confident enough on the possible side effects to say it is 
the best solution. 


--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira



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

svn commit: r1300888 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/

Author: markt
Date: Thu Mar 15 10:33:31 2012
New Revision: 1300888

URL: http://svn.apache.org/viewvc?rev=1300888&view=rev
Log:
Port some clean-up
Simplify merge info

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/Constants.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/FilterBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestFilter.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 10:33:31 2012
@@ -1 +1 @@
-/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,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320
 
,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226
 
551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1
 
244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569
+/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,1188

svn commit: r1300898 - /tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java

Author: markt
Date: Thu Mar 15 10:44:37 2012
New Revision: 1300898

URL: http://svn.apache.org/viewvc?rev=1300898&view=rev
Log:
Remove an accidental commit

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1300898&r1=1300897&r2=1300898&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Mar 
15 10:44:37 2012
@@ -533,12 +533,6 @@ public abstract class AbstractProtocol i
 SocketStatus status) {
 P processor = connections.remove(socket.getSocket());
 
-if (getLog().isDebugEnabled()) {
-getLog().debug("process() entry " +
-"Socket: [" + logHashcode(socket.getSocket()) + "], " +
-"Processor [" + logHashcode(processor) + "]");
-}
-
 socket.setAsync(false);
 
 try {
@@ -549,51 +543,20 @@ public abstract class AbstractProtocol i
 processor = createProcessor();
 }
 
-if (getLog().isDebugEnabled()) {
-getLog().debug("process() gotProcessor " +
-"Socket: [" + logHashcode(socket.getSocket()) + 
"], " +
-"Processor [" + logHashcode(processor) + "]");
-}
-
 initSsl(socket, processor);
 
 SocketState state = SocketState.CLOSED;
 do {
 if (processor.isAsync() || state == SocketState.ASYNC_END) 
{
 state = processor.asyncDispatch(status);
-if (getLog().isDebugEnabled()) {
-getLog().debug("process() asyncDispatch " +
-"Socket: [" + 
logHashcode(socket.getSocket()) + "], " +
-"Processor: [" + logHashcode(processor) + 
"], " +
-"State: [" + state.toString() + "]");
-}
 } else if (processor.isComet()) {
 state = processor.event(status);
-if (getLog().isDebugEnabled()) {
-getLog().debug("process() event " +
-"Socket: [" + 
logHashcode(socket.getSocket()) + "], " +
-"Processor: [" + logHashcode(processor) + 
"], " +
-"State: [" + state.toString() + "]");
-}
 } else {
 state = processor.process(socket);
-if (getLog().isDebugEnabled()) {
-getLog().debug("process() process " +
-"Socket: [" + 
logHashcode(socket.getSocket()) + "], " +
-"Processor: [" + logHashcode(processor) + 
"], " +
-"State: [" + state.toString() + "]");
-}
 }
 
 if (state != SocketState.CLOSED && processor.isAsync()) {
 state = processor.asyncPostProcess();
-if (getLog().isDebugEnabled()) {
-getLog().debug("process() asyncPostProcess " +
-"Socket: [" + 
logHashcode(socket.getSocket()) + "], " +
-"Processor: [" + logHashcode(processor) + 
"], " +
-"State: [" + state.toString() + "]");
-}
-
 }
 } while (state == SocketState.ASYNC_END);
 
@@ -639,14 +602,6 @@ public abstract class AbstractProtocol i
 return SocketState.CLOSED;
 }
 
-private String logHashcode (Object o) {
-if (o == null) {
-return "null";
-} else {
-return Integer.toString(o.hashCode());
-}
-}
-
 protected abstract P createProcessor();
 protected abstract void initSsl(SocketWrapper socket, P processor);
 protected abstract void longPoll(SocketWrapper socket, P processor);



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

svn commit: r1300900 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java

Author: markt
Date: Thu Mar 15 10:45:19 2012
New Revision: 1300900

URL: http://svn.apache.org/viewvc?rev=1300900&view=rev
Log:
Add test code present in trunk but not 7.0.x

Added:

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
   (contents, props changed)
  - copied, changed from r1190387, 
tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java

Copied: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
 (from r1190387, 
tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java)
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java&p1=tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java&r1=1190387&r2=1300900&rev=1300900&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
 Thu Mar 15 10:45:19 2012
@@ -1,133 +1,133 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.tomcat.util.http;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-
-import org.apache.tomcat.util.buf.B2CConverter;
-
-public class TesterParametersPerformance {
-
-@Test
-public void testProcessParametersByteArrayIntInt() {
-LogManager.getLogManager().getLogger("").setLevel(Level.OFF);
-doTestProcessParametersMultiple("foo".getBytes());
-}
-
-private void doTestProcessParametersMultiple(byte[] input) {
-System.out.println(doTestProcessParameters(input, 1));
-System.out.println(doTestProcessParameters(input, 2));
-System.out.println(doTestProcessParameters(input, 4));
-System.out.println(doTestProcessParameters(input, 8));
-System.out.println(doTestProcessParameters(input, 16));
-System.out.println(doTestProcessParameters(input, 32));
-System.out.println(doTestProcessParameters(input, 64));
-System.out.println(doTestProcessParameters(input, 128));
-}
-
-private long doTestProcessParameters(byte[] input, int size) {
-assertEquals(input.length, 3);
-
-Parameters p = new Parameters();
-
-byte[] params = createParams(input, size);
-//byte[] input = createParams(8);
-p.setEncoding("ISO-8859-1");
-long start = System.nanoTime();
-p.processParameters(params, 0, params.length);
-return System.nanoTime() - start;
-}
-
-private byte[] createParams(byte[] input, int len) {
-byte[] result = new byte[len * 4 - 1];
-
-for (int i = 0; i < len; i++) {
-result[i * 4] = input[0];
-result[i * 4 + 1] = input[1];
-result[i * 4 + 2] = input[2];
-if (i < len -1) {
-result[i * 4 + 3] = 38;
-}
-}
-return result;
-}
-
-@Test
-public void testCreateString() throws UnsupportedEncodingException {
-B2CConverter.getCharset("ISO-8859-1");
-doCreateStringMultiple("foo");
-}
-
-private void doCreateStringMultiple(String input) {
-System.out.println(doCreateString(input, 10, true));
-System.out.println(doCreateString(input, 100, true));
-System.out.println(doCreateString(input, 1000, true));
-System.out.println(doCreateString(input, 1, true));
-System.out.println(doCreateString(input, 10, true));
-System.out.println(doCreateString(input, 100, true));
-System.out.println(doCreateString(input, 200, true));
-//System.out.println(doCreateString(input, 400, true));
-//System.out.println(doCreateString(input, 800, true));
-System.out.println(doCreat

svn commit: r1300902 - /tomcat/tc7.0.x/trunk/

Author: markt
Date: Thu Mar 15 10:46:23 2012
New Revision: 1300902

URL: http://svn.apache.org/viewvc?rev=1300902&view=rev
Log:
Update / simplify merge info

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 10:46:23 2012
@@ -1 +1 @@
-/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,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263
 
,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226
 
538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1
 
244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569
+/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,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555
 
-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,120

svn commit: r1300907 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/ClusterSessionListener.java java/org/apache/catalina/ha/session/DeltaManager.java java/org/apache/catalina/ha/se

Author: markt
Date: Thu Mar 15 10:57:17 2012
New Revision: 1300907

URL: http://svn.apache.org/viewvc?rev=1300907&view=rev
Log:
Simplify merge info
A few whitespace changes

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/SessionMessage.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 10:57:17 2012
@@ -1 +1 @@
-/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,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555
 
-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230
 
762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1
 
297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569
+/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-1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692
 
,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1

Buildbot logs for tomcat-trunk builds

Hi!

Thanks to Gavin, the JUnit logs for tomcat-trunk builder
http://ci.apache.org/builders/tomcat-trunk
are available here:
http://ci.apache.org/projects/tomcat/tomcat8/logs/

They are organized by revision number.

More details here:
https://issues.apache.org/jira/browse/INFRA-3948

Best regards,
Konstantin Kolinko

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

Re: [ANN] Apache Tomcat Native 1.1.23 released

2012-03-15 Thread Henri Gomez

I discussed with Suse guys and they updated their libtcnative package
accordingly :

https://build.opensuse.org/package/files?package=libtcnative-1-0&project=Java%3Apackages

2012/3/2 Mladen Turk :
> The Apache Tomcat team announces the immediate availability of Apache
> Tomcat Native 1.1.23 stable.
>
> Please refer to the change log for the list of changes:
> http://tomcat.apache.org/native-doc/miscellaneous/changelog.html
>
> Downloads:
> http://tomcat.apache.org/download-native.cgi
>
> Please allow up to 24 hours for your local mirror to sync with
> the Apache distribution site.
>
> Note that with this release we changed the Windows binaries packaging.
> Instead standalone .dll files we now have a single
> tomcat-native-1.1.23-win32-bin.zip file containing libraries for both
> 32 and 64 bit JVM's. It can be found inside download binaries directory.
>
>
> Thank you,
> --
> The Apache Tomcat Team
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

svn commit: r1300948 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Author: markt
Date: Thu Mar 15 12:07:52 2012
New Revision: 1300948

URL: http://svn.apache.org/viewvc?rev=1300948&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52858
Fix high CPU load caused by tight(ish) loop when client doesn't read any data

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1300948&r1=1300947&r2=1300948&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Mar 15 
12:07:52 2012
@@ -1254,7 +1254,7 @@ public class NioEndpoint extends Abstrac
 public boolean processSendfile(SelectionKey sk, KeyAttachment 
attachment, boolean reg, boolean event) {
 NioChannel sc = null;
 try {
-//unreg(sk,attachment);//only do this if we do process send 
file on a separate thread
+unreg(sk, attachment, sk.readyOps());
 SendfileData sd = attachment.getSendfileData();
 if ( sd.fchannel == null ) {
 File f = new File(sd.fileName);



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

svn commit: r1300950 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml

Author: markt
Date: Thu Mar 15 12:10:43 2012
New Revision: 1300950

URL: http://svn.apache.org/viewvc?rev=1300950&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52858
Fix high CPU load caused by tight(ish) loop when client breaks the connection 
and stops reading data

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 12:10:43 2012
@@ -1 +1 @@
-/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-1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692
 
,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232
 
447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569
+/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-1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692
 
,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,12

DO NOT REPLY [Bug 52858] High CPU load in the NIO connector, when a client breaks connection unexpectedly

https://issues.apache.org/bugzilla/show_bug.cgi?id=52858

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Mark Thomas  2012-03-15 12:12:23 UTC ---
Thanks for the test case. It made investigating this issue a whole lot easier.

I fixed this with a slightly different patch that addresses the root cause -
i.e. not unregistering the interest in OP_READ while the sendfile write is in
progress.

This has been fixed in trunk and 7.0.x and will be included in 7.0.27 onwards.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

buildbot failure in ASF Buildbot on tomcat-trunk

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

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1300948
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

Re: WebSockets in Tomcat 6

2012-03-15 Thread Mark Thomas

On 14/03/2012 17:42, Filip Hanik Mailing Lists wrote:
> 
> http://people.apache.org/~fhanik/reports/servers/
> 
> Attached is a patch that leverages the Tomcat WebSocket API with
> minimalistic changes and uses that to implement WebSockets in Tomcat
> 6.0.x http://people.apache.org/~fhanik/websockets-for-tomcat-6.patch

Nice. There was me hoping the WebSocket support would be a driver for
upgrading to 7.0.x. Oh well. Having the the support in 6.0.x is very nice.

> This implementation doesn't touch the endpoints or any real connector
> logic, making it risk free. The only change that could do anything,
> would be the XXXProcessor +if (statusCode ==
> HttpServletResponse.SC_SWITCHING_PROTOCOLS) { +
> outputBuffer.addActiveFilter +
> (outputFilters[Constants.IDENTITY_FILTER]); +} else

Those look OK to me. I do wonder if the changes to
CometEventImpl#setTimeout() might cause a surprise for someone though.

> Where it sets an identity filter when the user is switching
> protocols. Otherwise Tomcat defaults to chunked encoding. You can
> still see Tomcat 8 sends a Transfer-Encoding:chunked as part of a web
> socket response.

That should probably be cleaned up although it doesn't matter that much
since no response body is sent back anyway.

> This implementation also works with BIO connector, as Tomcat's
> CometProcessor interface supports both, and let's the implementer
> implement both Comet and non Comet in the same class.
> 
> Hopefully this patch shows 1. It's fairly risk free to implement this
> in stables branches as Tomcat 6, and possibly Tomcat 7 (as we may
> want to treat this as fairly stable and minimize refactoring this
> late in the game) 2. Performance of Comet is similar to the non Comet
> implementation 3. It took me 4 hours to do this migration, so it's
> definitely very easy to work with Comet once you have the bulk work
> done (the WebSocket protocol impl by Mark Thomas)
> 
> The test suite report is at 
> http://people.apache.org/~fhanik/reports/servers/
> 
> I would suggest we consider this for Tomcat 6(my experience is still
> most users are using this version).

I have no problem with that.

> For Tomcat 7, I would recommend
> it, as it avoids refactoring, but I'm pretty neutral about it.

My only concern is that the issue Costin raised regarding scalability
since this approach retains the HttpProcessor along with the Request and
Response objects. I don't know how much of an issue scalability is going
to turn out to be but given the relatively low impact even of the
generic upgrade changes I think they should be safe. Looking into
back-porting that is next on my to-do list.

Mark

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

Re: WebSockets in Tomcat 6

2012-03-15 Thread Filip Hanik - Dev Lists

On 3/15/2012 6:54 AM, Mark Thomas wrote:

On 14/03/2012 17:42, Filip Hanik Mailing Lists wrote:

http://people.apache.org/~fhanik/reports/servers/

Attached is a patch that leverages the Tomcat WebSocket API with
minimalistic changes and uses that to implement WebSockets in Tomcat
6.0.x http://people.apache.org/~fhanik/websockets-for-tomcat-6.patch

Nice. There was me hoping the WebSocket support would be a driver for
upgrading to 7.0.x. Oh well. Having the the support in 6.0.x is very nice.

This implementation doesn't touch the endpoints or any real connector
logic, making it risk free. The only change that could do anything,
would be the XXXProcessor +if (statusCode ==
HttpServletResponse.SC_SWITCHING_PROTOCOLS) { +
outputBuffer.addActiveFilter +
(outputFilters[Constants.IDENTITY_FILTER]); +} else

Those look OK to me. I do wonder if the changes to
CometEventImpl#setTimeout() might cause a surprise for someone though.

yes it could, but I doubt it. I felt it was very important to not change the
API for a . release of Tomcat 6 this late in the game.
Instead of calling I can do

((Request)getField("request", event)).protocolSwitch();
and now that you mention it, I will change the patch to do just that. It is
much clearer.

Where it sets an identity filter when the user is switching
protocols. Otherwise Tomcat defaults to chunked encoding. You can
still see Tomcat 8 sends a Transfer-Encoding:chunked as part of a web
socket response.

That should probably be cleaned up although it doesn't matter that much
since no response body is sent back anyway.

This implementation also works with BIO connector, as Tomcat's
CometProcessor interface supports both, and let's the implementer
implement both Comet and non Comet in the same class.

Hopefully this patch shows 1. It's fairly risk free to implement this
in stables branches as Tomcat 6, and possibly Tomcat 7 (as we may
want to treat this as fairly stable and minimize refactoring this
late in the game) 2. Performance of Comet is similar to the non Comet
implementation 3. It took me 4 hours to do this migration, so it's
definitely very easy to work with Comet once you have the bulk work
done (the WebSocket protocol impl by Mark Thomas)

The test suite report is at
http://people.apache.org/~fhanik/reports/servers/

I would suggest we consider this for Tomcat 6(my experience is still
most users are using this version).

I have no problem with that.

For Tomcat 7, I would recommend
it, as it avoids refactoring, but I'm pretty neutral about it.

My only concern is that the issue Costin raised regarding scalability
since this approach retains the HttpProcessor along with the Request and
Response objects. I don't know how much of an issue scalability is going
to turn out to be but given the relatively low impact even of the
generic upgrade changes I think they should be safe. Looking into
back-porting that is next on my to-do list.

That is a valid point. If the chats are long running holding headers in memory,
is a waste.
The other thing to consider for Tomcat 7 is SPDY support in v7, if that is done using the same mechanism, then that may favor the Tomcat 8
approach

Filip

Mark

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

svn commit: r1300997 - in /tomcat/trunk/webapps/docs: project.xml web-socket-howto.xml

Author: markt
Date: Thu Mar 15 14:21:32 2012
New Revision: 1300997

URL: http://svn.apache.org/viewvc?rev=1300997&view=rev
Log:
Document WebSocket support

Added:
tomcat/trunk/webapps/docs/web-socket-howto.xml   (with props)
Modified:
tomcat/trunk/webapps/docs/project.xml

Modified: tomcat/trunk/webapps/docs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=1300997&r1=1300996&r2=1300997&view=diff
==
--- tomcat/trunk/webapps/docs/project.xml (original)
+++ tomcat/trunk/webapps/docs/project.xml Thu Mar 15 14:21:32 2012
@@ -72,6 +72,7 @@
   href="windows-auth-howto.html"/>
 
+
 
 
 

Added: tomcat/trunk/webapps/docs/web-socket-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/web-socket-howto.xml?rev=1300997&view=auto
==
--- tomcat/trunk/webapps/docs/web-socket-howto.xml (added)
+++ tomcat/trunk/webapps/docs/web-socket-howto.xml Thu Mar 15 14:21:32 2012
@@ -0,0 +1,71 @@
+
+
+
+]>
+
+
+&project;
+
+
+  WebSocket How-To
+
+
+
+
+
+
+
+
+
+Tomcat provides support for WebSocket as defined by
+   http://tools.ietf.org/html/rfc6455";>RFC 6455. This feature is
+   not yet finalised and you are encouraged to provide feedback in the form
+   of bug reports (via
+   https://issues.apache.org/bugzilla";>Bugzilla), suggested API
+   changes (via the mailto:dev@tomcat.apache.org";>dev list) or
+   other comments (again via the mailto:dev@tomcat.apache.org";>dev
+   list).
+
+
+
+The API used for application development has not yet been finalised. Rather
+   than document something here that will quickly be out of date, please see 
the
+   Javadoc for the
+   
+   org.apache.catalina.websocket package. To
+   view this locally, you'll need to to install the full-docs package. You can
+   also read this on the Apache Tomcat website. Start with the
+   
+   WebSocketServlet class.
+
+There are also several example applications that demonstrate how the
+   WebSocket API can be used. You'll need to look at both the client side http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/";>
+   html and the server side http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/";>
+   code.
+
+Do keep in mind that the API is fluid and is likely to change, possibly
+   significantly, between point releases. The documentation will be updated 
once
+   the API is considered stable (unlikely to be until JSR 356 is complete).
+
+
+
+
+

Propchange: tomcat/trunk/webapps/docs/web-socket-howto.xml
--
svn:eol-style = native



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

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

2012-03-15 Thread fhanik

Author: fhanik
Date: Thu Mar 15 14:23:29 2012
New Revision: 1300999

URL: http://svn.apache.org/viewvc?rev=1300999&view=rev
Log:
Bug fix for send file CPU usage 

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=1300999&r1=1300998&r2=1300999&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 15 14:23:29 2012
@@ -173,6 +173,11 @@ PATCHES PROPOSED TO BACKPORT:
   +1: markt
   -1:
 
+* Fix bug https://issues.apache.org/bugzilla/show_bug.cgi?id=52858
+  http://svn.apache.org/viewvc?rev=1300948&view=rev
+  +1: fhanik
+  -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: r1300997 - in /tomcat/trunk/webapps/docs: project.xml web-socket-howto.xml

2012/3/15  :
> Author: markt
> Date: Thu Mar 15 14:21:32 2012
> New Revision: 1300997
>
> URL: http://svn.apache.org/viewvc?rev=1300997&view=rev
> Log:
> Document WebSocket support
>
> Added:
>    tomcat/trunk/webapps/docs/web-socket-howto.xml   (with props)
> Modified:
>    tomcat/trunk/webapps/docs/project.xml

The documents are listed not only in the menu, but on the title page
as well (index.xml). You may add it there.


> Modified: tomcat/trunk/webapps/docs/project.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=1300997&r1=1300996&r2=1300997&view=diff
> ==
> --- tomcat/trunk/webapps/docs/project.xml (original)
> +++ tomcat/trunk/webapps/docs/project.xml Thu Mar 15 14:21:32 2012
> @@ -72,6 +72,7 @@
>               href="windows-auth-howto.html"/>
>                        href="jdbc-pool.html"/>
> +        
>     
>
>     
>
> Added: tomcat/trunk/webapps/docs/web-socket-howto.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/web-socket-howto.xml?rev=1300997&view=auto
>
(...)

Best regards,
Konstantin Kolinko

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

Re: svn commit: r1300997 - in /tomcat/trunk/webapps/docs: project.xml web-socket-howto.xml

2012-03-15 Thread Mark Thomas

On 15/03/2012 14:32, Konstantin Kolinko wrote:
> 2012/3/15  :
>> Author: markt
>> Date: Thu Mar 15 14:21:32 2012
>> New Revision: 1300997
>>
>> URL: http://svn.apache.org/viewvc?rev=1300997&view=rev
>> Log:
>> Document WebSocket support
>>
>> Added:
>>tomcat/trunk/webapps/docs/web-socket-howto.xml   (with props)
>> Modified:
>>tomcat/trunk/webapps/docs/project.xml
> 
> The documents are listed not only in the menu, but on the title page
> as well (index.xml). You may add it there.

Thanks. Fixed.

Mark

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

svn commit: r1301006 - /tomcat/trunk/webapps/docs/index.xml

Author: markt
Date: Thu Mar 15 14:36:03 2012
New Revision: 1301006

URL: http://svn.apache.org/viewvc?rev=1301006&view=rev
Log:
Link to WebSocket doc

Modified:
tomcat/trunk/webapps/docs/index.xml

Modified: tomcat/trunk/webapps/docs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1301006&r1=1301005&r2=1301006&view=diff
==
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Thu Mar 15 14:36:03 2012
@@ -135,6 +135,8 @@ Apache Tomcat 7, and using many of the A
 Configuring Tomcat to use integrated Windows authentication.
 High Concurrency JDBC Pool -
 Configuring Tomcat to use an alternative JDBC pool.
+WebSocket support -
+Developing WebSocket applications for Apache Tomcat.
 
 
 



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

buildbot success in ASF Buildbot on tomcat-trunk

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

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1300997
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot

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

2012-03-15 Thread fhanik

Author: fhanik
Date: Thu Mar 15 15:07:22 2012
New Revision: 1301027

URL: http://svn.apache.org/viewvc?rev=1301027&view=rev
Log:
votes

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=1301027&r1=1301026&r2=1301027&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 15 15:07:22 2012
@@ -66,18 +66,18 @@ PATCHES PROPOSED TO BACKPORT:
   HTTP response code when rejecting denied request. E.g. 404 instead of 403.
   
http://people.apache.org/~kkolinko/patches/2011-11-16_tc6_RequestFilterValve_denyStatus.patch
   (r1202565 in trunk, r1202570 in TC7)
-  +1: kkolinko, rjung
+  +1: kkolinko, rjung, fhanik
   -1:
 
 * Reduce overhead from exception handling in UDecoder
   http://people.apache.org/~kkolinko/patches/2011-11-17_tc6_UDecoder.patch
   (r1203054 in TC7)
-  +1: kkolinko,funkman
+  +1: kkolinko,funkman, fhanik
   -1:
 
 * Align %2f handling between implementations of UDecoder.convert()
   http://svn.apache.org/viewvc?rev=1203091&view=rev
-  +1: kkolinko,funkman
+  +1: kkolinko,funkman, fhanik
   -1:
 
 * Backport SetCharacterEncodingFilter
@@ -119,13 +119,13 @@ PATCHES PROPOSED TO BACKPORT:
   This fix does not reintroduce issue BZ51400.
   This fix avoids http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6196991.
   https://issues.apache.org/bugzilla/attachment.cgi?id=28274
-  +1: kfujino
-  -1:
+  +1: kfujino, fhanik
+  -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52606
   Ensure replayed POST bodies are available when using AJP
   http://svn.apache.org/viewvc?rev=1241985&view=rev
-  +1: markt, kfujino
+  +1: markt, kfujino, fhanik
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51477
@@ -134,36 +134,37 @@ PATCHES PROPOSED TO BACKPORT:
 http://svn.apache.org/viewvc?rev=1145209&view=rev
   TC 6 patch:
 
http://people.apache.org/~rjung/patches/tc6-apr-all-sslprotocol-r1145209.patch
-  +1: rjung, mturk
+  +1: rjung, mturk, fhanik
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52719
   Correct theoretical resource leak during Jar validation
   http://svn.apache.org/viewvc?rev=1298143&view=rev
-  +1: markt
+  +1: markt, fhanik
   -1:
 
 * Replicate Principal in ClusterSingleSignOn.
   http://svn.apache.org/viewvc?view=revision&revision=1298299
-  +1: kfujino
+  +1: kfujino, fhanik
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52500
   Add configurable mechanism to retrieve user names from X509 client 
certificates.
   trunk patch: http://svn.apache.org/viewvc?view=revision&revision=r1298476
-  +1: schultz
+  +1: schultz. fhanik
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52723
   Correct theoretical resource leak in StandardManager
   http://svn.apache.org/viewvc?rev=1299036&view=rev
-  +1: markt
+  +1: markt, fhanik
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52830
   Lookups using javax.naming.Name fail
   http://svn.apache.org/viewvc?rev=1298635&view=rev
   +1: markt
+  +1: fhanik - would have been easier to read if 90% of the patch wasn't 
document/formatting related
   -1:
 
 * https://issues.apache.org/bugzilla/show_bug.cgi?id=52811
@@ -171,6 +172,7 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1300155&view=rev (new HTTP header parser)
   http://svn.apache.org/viewvc?rev=1300161&view=rev (the actual fix)
   +1: markt
+   0: fhanik - introducing a new parser this late into a release seems too 
risky for 6
   -1:
 
 * Fix bug https://issues.apache.org/bugzilla/show_bug.cgi?id=52858



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

DO NOT REPLY [Bug 51872] request.getRemoteAddr() sometimes returning IP address from the previous request

https://issues.apache.org/bugzilla/show_bug.cgi?id=51872

Michael Hauck  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |

--- Comment #15 from Michael Hauck  2012-03-15 
15:08:24 UTC ---
Mark,

we upgraded from 6.0.29 to 7.0.23 and have exactly the same problem. I can
certainly exclude an application bug. This method is fundamental!

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52918] New: Add WebSocket Support to Tomcat 6

https://issues.apache.org/bugzilla/show_bug.cgi?id=52918

 Bug #: 52918
   Summary: Add WebSocket Support to Tomcat 6
   Product: Tomcat 6
   Version: 6.0.35
  Platform: PC
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: fha...@apache.org
Classification: Unclassified


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52918] Add WebSocket Support to Tomcat 6

https://issues.apache.org/bugzilla/show_bug.cgi?id=52918

--- Comment #1 from Filip Hanik  2012-03-15 15:22:02 UTC ---
Created attachment 28471
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28471
Patch to add websocket API on top Comet

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52918] Add WebSocket Support to Tomcat 6

https://issues.apache.org/bugzilla/show_bug.cgi?id=52918

--- Comment #2 from Filip Hanik  2012-03-15 15:22:25 UTC ---
Per
http://markmail.org/thread/prqa47k3bw22bbhb

Adding patches to track progress on this issue

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1301042 - /tomcat/tc6.0.x/trunk/STATUS.txt

2012-03-15 Thread fhanik

Author: fhanik
Date: Thu Mar 15 15:23:07 2012
New Revision: 1301042

URL: http://svn.apache.org/viewvc?rev=1301042&view=rev
Log:
votes

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=1301042&r1=1301041&r2=1301042&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 15 15:23:07 2012
@@ -180,6 +180,10 @@ PATCHES PROPOSED TO BACKPORT:
   +1: fhanik
   -1:
   
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52918
+  Add WebSocket support to Tomcat 6
+  +1: fhanik
+
 
 PATCHES/ISSUES THAT ARE STALLED
 



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

DO NOT REPLY [Bug 52919] New: WebappClassLoader.clearReferencesJdbc is not loading the exact content of the JdbcLeakPrevention.class file

https://issues.apache.org/bugzilla/show_bug.cgi?id=52919

 Bug #: 52919
   Summary: WebappClassLoader.clearReferencesJdbc is not loading
the exact content of the JdbcLeakPrevention.class file
   Product: Tomcat 7
   Version: trunk
  Platform: PC
OS/Version: Windows Server 2003
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: kelap...@gmail.com
Classification: Unclassified


org.apache.catalina.loader.WebappClassLoader.clearReferencesJdbc() is
incorrectly reading org/apache/catalina/loader/JdbcLeakPrevention.class file
from disk causing extra bytes in the byte[] passed to
java.lang.ClassLoader.defineClass(String, byte[], int, int, ProtectionDomain).

Having extra bytes at the end of a .class file has always been illegal.  This
did NOT cause any issues in the past because in previous JDK releases, the test
for this condition rarely active. 

Oracle change their behaviour in java 6 to mark this as an error consequently
any extra bytes leads to errors like these

Caused by: java.lang.ClassFormatError: JVMCFRE118 extra bytes after EOF;
class=com/ibm/ws/runtime/component/JdbcLeakPrevention, offset=2499

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52919] WebappClassLoader.clearReferencesJdbc is not loading the exact content of the JdbcLeakPrevention.class file

https://issues.apache.org/bugzilla/show_bug.cgi?id=52919

--- Comment #1 from Konstantin Kolinko  2012-03-15 
15:53:13 UTC ---
With what exact version of Java and what exact version of Tomcat are you
observing an error? Or it is just a theoretical speculation?  I assure you that
many people are using Tomcat 7 with Java 6.

It does not matter whether there are extra unused bytes in the bytes array,
because offset and length of the used part of the array are explicitly
specified in the call. The offset is always "0" and the length is provided by
variable named "offset" which counts the bytes that have been read into the
classBytes array.

I am closing this as INVALID, unless you can provide some evidence.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52919] WebappClassLoader.clearReferencesJdbc is not loading the exact content of the JdbcLeakPrevention.class file

https://issues.apache.org/bugzilla/show_bug.cgi?id=52919

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52919] WebappClassLoader.clearReferencesJdbc is not loading the exact content of the JdbcLeakPrevention.class file

https://issues.apache.org/bugzilla/show_bug.cgi?id=52919

--- Comment #2 from Rohit Kelapure  2012-03-15 15:58:35 UTC 
---
Upon closer inspection of the code I have realized that this is not an issue. 
Please cancel this defect

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52918] Add WebSocket Support to Tomcat 6

https://issues.apache.org/bugzilla/show_bug.cgi?id=52918

Filip Hanik  changed:

   What|Removed |Added

  Attachment #28471|0   |1
is obsolete||

--- Comment #3 from Filip Hanik  2012-03-15 17:02:54 UTC ---
Created attachment 28472
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28472
Patch to add websocket API on top Comet

over the 28471 patch this forces keepAlive=false when the protocol switch has
been initiated. keepAlive is a HTTP feature and there is no guarantee what is
on the wire when the protocol has been switched

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52918] Add WebSocket Support to Tomcat 6

https://issues.apache.org/bugzilla/show_bug.cgi?id=52918

Filip Hanik  changed:

   What|Removed |Added

  Attachment #28472|0   |1
is obsolete||

--- Comment #4 from Filip Hanik  2012-03-15 17:21:55 UTC ---
Created attachment 28473
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28473
Patch to add websocket API on top Comet

attached the old patch instead of the new

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1301107 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/http/Parameters.java webapps/docs/changelog.xml

Author: kkolinko
Date: Thu Mar 15 17:30:35 2012
New Revision: 1301107

URL: http://svn.apache.org/viewvc?rev=1301107&view=rev
Log:
Reduce log level for message for hitting parameter count limit from warn to 
info.
Fix limit comparison to allow exactly (maxParameterCount) parameters, instead 
of (maxParameterCount-1).

Backports r1224665 from 7.0.x, r1224663 from trunk.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
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=1301107&r1=1301106&r2=1301107&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 15 17:30:35 2012
@@ -90,14 +90,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, rjung, kfujino
   -1:
 
-* Reduce log level for the message about hitting maxParameterCount limit
-  from WARN to INFO and fix comparison of parameterCount vs limit that
-  triggers this message.
-  
http://people.apache.org/~kkolinko/patches/2012-01-16_tc6_Parameters_maxCountFail.patch
-  (backport of http://svn.apache.org/viewvc?rev=1224665&view=rev)
-  +1: kkolinko, rjung, kfujino
-  -1:
-
 * Improvements to Windows installer:
   1. When building a Windows installer do not copy whole "res" folder to
  output/dist, but only the files that we need. Make sure that

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1301107&r1=1301106&r2=1301107&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu 
Mar 15 17:30:35 2012
@@ -237,9 +237,9 @@ public final class Parameters {
 while(pos < end) {
 parameterCount ++;
 
-if (limit > -1 && parameterCount >= limit) {
+if (limit > -1 && parameterCount > limit) {
 parseFailed = true;
-log.warn(sm.getString("parameters.maxCountFail",
+log.info(sm.getString("parameters.maxCountFail",
 Integer.valueOf(limit)));
 break;
 }

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1301107&r1=1301106&r2=1301107&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Mar 15 17:30:35 2012
@@ -96,6 +96,13 @@
 52488: Correct typos: exipre -> expire. Based on a patch by
 prockter. (markt)
   
+  
+Reduce log level for the message about hitting
+maxParameterCount limit from WARN to INFO.
+Fix limit comparison to allow exactly maxParameterCount
+parameters, as documentation says, instead of
+(maxParameterCount-1). (kkolinko)
+  
 
   
   



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

RE: Upgrade Tomcat 6 from ECJ 3.7 to ECJ 3.7.1?

A correction to my previous email:



> From what I can tell, the key is the ECJ library. Tomcat 7 has ECJ 3.7.1,
which has full Java 7 support, while Tomcat 6 has *ECJ* 3.7.0, which has NO
Java 7 support.



Note that I should have said that Tomcat 6 has “ECJ 3.7.0” like above
instead of “JCT 3.7.0” like below. Not sure where the “JTC” came from…



Nick





*From:* Nick Williams [mailto:nicholas.willi...@puresafety.com]
*Sent:* Monday, March 12, 2012 3:12 PM
*To:* 'dev@tomcat.apache.org'
*Subject:* Upgrade Tomcat 6 from ECJ 3.7 to ECJ 3.7.1?



We are researching upgrading our application from Java 6 to Java 7. From
what I can tell, Tomcat 6, and our application in Tomcat 6, run fine in
Java 7. No problems whatsoever. Until you use Java 7 language features in a
JSP. Tomcat 7, however, does not have this problem.



>From what I can tell, the key is the ECJ library. Tomcat 7 has ECJ 3.7.1,
which has full Java 7 support, while Tomcat 6 has JCT 3.7.0, which has NO
Java 7 support.



Seeing as how these versions of ECJ are a mere 1 patch apart, are there any
plans to upgrade Tomcat 6 to ECJ 3.7.1? It would sure be nice to tell our
customers they can still run our application on Tomcat 6.



Furthermore, are there any compelling reasons *not* to upgrade Tomcat 6 to
ECJ 3.7.1?



Thanks,



Nick Williams

Re: Upgrade Tomcat 6 from ECJ 3.7 to ECJ 3.7.1?

2012/3/15 Nick Williams :
> A correction to my previous email:
>
>
>
>> From what I can tell, the key is the ECJ library. Tomcat 7 has ECJ 3.7.1,
> which has full Java 7 support, while Tomcat 6 has *ECJ* 3.7.0, which has NO
> Java 7 support.
>
>
>
> Note that I should have said that Tomcat 6 has “ECJ 3.7.0” like above
> instead of “JCT 3.7.0” like below. Not sure where the “JTC” came from…
>

Just download ecj-3.7.2.jar from eclipse.org [1] and put it into libs
directory, instead of 3.7 one.

[1] https://issues.apache.org/bugzilla/show_bug.cgi?id=52805


The next release of 7.0.x will have 3.7.2 in it.

Best regards,
Konstantin Kolinko

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

Re: WebSockets in Tomcat 6

2012-03-15 Thread Costin Manolache

On Thu, Mar 15, 2012 at 7:10 AM, Filip Hanik - Dev Lists  wrote:

> On 3/15/2012 6:54 AM, Mark Thomas wrote:
>
>> On 14/03/2012 17:42, Filip Hanik Mailing Lists wrote:
>>
>>> http://people.apache.org/~**fhanik/reports/servers/
>>>
>>> Attached is a patch that leverages the Tomcat WebSocket API with
>>> minimalistic changes and uses that to implement WebSockets in Tomcat
>>> 6.0.x 
>>> http://people.apache.org/~**fhanik/websockets-for-tomcat-**6.patch
>>>
>> Nice. There was me hoping the WebSocket support would be a driver for
>> upgrading to 7.0.x. Oh well. Having the the support in 6.0.x is very nice.
>>
>>  This implementation doesn't touch the endpoints or any real connector
>>> logic, making it risk free. The only change that could do anything,
>>> would be the XXXProcessor +if (statusCode ==
>>> HttpServletResponse.SC_**SWITCHING_PROTOCOLS) { +
>>> outputBuffer.addActiveFilter +
>>> (outputFilters[Constants.**IDENTITY_FILTER]); +} else
>>>
>> Those look OK to me. I do wonder if the changes to
>> CometEventImpl#setTimeout() might cause a surprise for someone though.
>>
> yes it could, but I doubt it. I felt it was very important to not change
> the API for a . release of Tomcat 6 this late in the game.
> Instead of calling I can do
>
>  ((Request)getField("request", event)).protocolSwitch();
> and now that you mention it, I will change the patch to do just that. It
> is much clearer.
>
>
>
>
>>  Where it sets an identity filter when the user is switching
>>> protocols. Otherwise Tomcat defaults to chunked encoding. You can
>>> still see Tomcat 8 sends a Transfer-Encoding:chunked as part of a web
>>> socket response.
>>>
>> That should probably be cleaned up although it doesn't matter that much
>> since no response body is sent back anyway.
>>
>>  This implementation also works with BIO connector, as Tomcat's
>>> CometProcessor interface supports both, and let's the implementer
>>> implement both Comet and non Comet in the same class.
>>>
>>> Hopefully this patch shows 1. It's fairly risk free to implement this
>>> in stables branches as Tomcat 6, and possibly Tomcat 7 (as we may
>>> want to treat this as fairly stable and minimize refactoring this
>>> late in the game) 2. Performance of Comet is similar to the non Comet
>>> implementation 3. It took me 4 hours to do this migration, so it's
>>> definitely very easy to work with Comet once you have the bulk work
>>> done (the WebSocket protocol impl by Mark Thomas)
>>>
>>> The test suite report is at
>>> http://people.apache.org/~**fhanik/reports/servers/
>>>
>>> I would suggest we consider this for Tomcat 6(my experience is still
>>> most users are using this version).
>>>
>> I have no problem with that.
>>
>>  For Tomcat 7, I would recommend
>>> it, as it avoids refactoring, but I'm pretty neutral about it.
>>>
>> My only concern is that the issue Costin raised regarding scalability
>> since this approach retains the HttpProcessor along with the Request and
>> Response objects. I don't know how much of an issue scalability is going
>> to turn out to be but given the relatively low impact even of the
>> generic upgrade changes I think they should be safe. Looking into
>> back-porting that is next on my to-do list.
>>
> That is a valid point. If the chats are long running holding headers in
> memory, is a waste.
> The other thing to consider for Tomcat 7 is SPDY support in v7, if that is
> done using the same mechanism, then that may favor the Tomcat 8 approach


I haven't looked at the tomcat6/tomcat7 interfaces, but I think the current
hook mechanism used by spdy could be ported with minimal risk and could be
used by websockets.

All we need in both cases is for the request to stop being processed by the
original protocol, and to have direct access to the socket. Than spdy can
do its multiplexing and websocket can keep the socket alive and let the
original request headers go away.

The hard part for spdy backporting is getting the SpdyProcessor - i.e. the
virtual/multiplexed  request/response, not associated with a real socket. (
which still requires lots of work on trunk, to get the rest of the features
- comet, websocket-over-spdy, etc ). Not sure how hard it'll be to
backport, but still it shouldn't be very risky.

The other problem is the native apr library - but with java7 and jetty's
jsse-npn we can do spdy on nio/bio, so it's less of a problem.

Costin


>
> Filip
>
>
>
>
>> Mark
>>
>> --**--**-
>> To unsubscribe, e-mail: 
>> dev-unsubscribe@tomcat.apache.**org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
>>
>>
>
> --**--**-
> To unsubscribe, e-mail: 
> dev-unsubscribe@tomcat.apache.**org
> For additional command

RE: Upgrade Tomcat 6 from ECJ 3.7 to ECJ 3.7.1?

Good to know. What about the next version of Tomcat 6? Will it also get
3.7.2 (or at least 3.7.1)? Or will it stay on 3.7.0 for the foreseeable
future? That's my big concern. As long as Tomcat 6 has 3.7.1 or better, it
should be able to compile JSPs for Java 7. With 3.7.0, it can't.

Nick


-Original Message-
From: Konstantin Kolinko [mailto:knst.koli...@gmail.com]
Sent: Thursday, March 15, 2012 12:41 PM
To: Tomcat Developers List
Subject: Re: Upgrade Tomcat 6 from ECJ 3.7 to ECJ 3.7.1?

2012/3/15 Nick Williams :
> A correction to my previous email:
>
>
>
>> From what I can tell, the key is the ECJ library. Tomcat 7 has ECJ
>> 3.7.1,
> which has full Java 7 support, while Tomcat 6 has *ECJ* 3.7.0, which
> has NO Java 7 support.
>
>
>
> Note that I should have said that Tomcat 6 has "ECJ 3.7.0" like above
> instead of "JCT 3.7.0" like below. Not sure where the "JTC" came from.
>

Just download ecj-3.7.2.jar from eclipse.org [1] and put it into libs
directory, instead of 3.7 one.

[1] https://issues.apache.org/bugzilla/show_bug.cgi?id=52805


The next release of 7.0.x will have 3.7.2 in it.

Best regards,
Konstantin Kolinko

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

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

Re: Upgrade Tomcat 6 from ECJ 3.7 to ECJ 3.7.1?

2012/3/15 Nick Williams :
> Good to know. What about the next version of Tomcat 6? Will it also get
> 3.7.2 (or at least 3.7.1)? Or will it stay on 3.7.0 for the foreseeable
> future? That's my big concern. As long as Tomcat 6 has 3.7.1 or better, it
> should be able to compile JSPs for Java 7. With 3.7.0, it can't.
>


1. Please do not top-post.

2. There is some time (months?) before next Tomcat 6. I think ECJ
version will be updated.

3. The more people use and say there are no issues, the easier it is to update.

In your case, to use Java 7 features in JSPs you would have to also
reconfigure JspServlet (using compilerSourceVM / compilerTargetVM
options) to target Java 7.

Best regards,
Konstantin Kolinko

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

DO NOT REPLY [Bug 52921] New: mod_jk 1.2.33 crashes Apache 2.2 when accessing HTML, GIF, etc.

https://issues.apache.org/bugzilla/show_bug.cgi?id=52921

 Bug #: 52921
   Summary: mod_jk 1.2.33 crashes Apache 2.2 when accessing HTML,
GIF, etc.
   Product: Tomcat Connectors
   Version: unspecified
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: mod_jk
AssignedTo: dev@tomcat.apache.org
ReportedBy: thad.humphr...@gmail.com
Classification: Unclassified


Created attachment 28475
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28475
mod_jk.log showing full run from Apache start through failed HTML page

Since October 2011, I have run the mod_jk/1.2.32 connector. I built the
connector myself using Apache 2.2.15's apxs (I also built Apache myself).

I downloaded, built, and installed the latest mod_jk.1.2.33 connector. This
version causes my Apache server to crash when serving most any page I've
tried--HTML, cgi-bin/test-cgi, GIF, etc. The only exceptions I've found are
Apache's htdocs/index.html page, server-info, and Tomcat served pages.

Initially I tried building the connector using --with-apxs set to the apxs in
my copy of Apache 2.2.15. When that failed, I downloaded, built, and installed
Apache 2.2.22, then built mod_jk 1.2.33 with the apxs from that version. Again,
Apache (this time 2.2.22) crashes with mod_jk 1.2.33, but runs fine with the
1.2.32 connector.

I am running openSUSE Linux 11.4. From the connector's config.log:
uname -m = i686
uname -r = 2.6.37.6-0.11-desktop
uname -s = Linux
uname -v = #1 SMP PREEMPT 2011-12-19 23:39:38 +0100

To document the problem, I added "CoreDumpDirectory /tmp" to httpd.conf, set
"JkLogLevel trace" for mod_jk, made sure I was going to load mod_jk/1.2.33, and
started Tomcat and Apache (I don't see Tomcat as necessary for this, but just
be thorough). I accessed a simple HTML page. (I get similar results trying to
access the local Apache manual, local javadocs, etc.)

I'm attaching the mod_jk.log that resulted. Below is the entire contents of the
Apache error_log:

[Thu Mar 15 09:05:14 2012] [warn] Init: Session Cache is not configured [hint:
SSLSessionCache]
[Thu Mar 15 09:05:14 2012] [notice] Apache/2.2.22 (Unix) mod_ssl/2.2.22
OpenSSL/1.0.0c mod_jk/1.2.33 configured -- resuming normal operations
[Thu Mar 15 09:05:22 2012] [notice] child pid 24552 exit signal Segmentation
fault (11), possible coredump in /tmp


Here is what I find in /tmp/core with gdb:

$ gdb /srv/apache2/bin/httpd /tmp/core
GNU gdb (GDB) SUSE (7.2-3.3)
Copyright (C) 2010 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "i586-suse-linux".
For bug reporting instructions, please see:
...
Reading symbols from /srv/apache2.2.22/bin/httpd...done.
[New Thread 24552]
...
Loaded symbols for /lib/ld-linux.so.2
Reading symbols from /srv/apache2/modules/mod_jk.so...done.
Loaded symbols for /srv/apache2/modules/mod_jk.so
Core was generated by `/srv/apache2.2.22/bin/httpd -k start'.
Program terminated with signal 11, Segmentation fault.
#0  0xb720288c in jk_map_to_storage () from /srv/apache2/modules/mod_jk.so
(gdb) backtrace
#0  0xb720288c in jk_map_to_storage () from /srv/apache2/modules/mod_jk.so
#1  0x08081478 in ap_run_map_to_storage ()
#2  0x08081e55 in ap_process_request_internal ()
#3  0x080da502 in ap_process_request ()
#4  0x080d7531 in ap_process_http_connection ()
#5  0x0808f05f in ap_run_process_connection ()
#6  0x0808f474 in ap_process_connection ()
#7  0x080f3deb in child_main ()
#8  0x080f3fe0 in make_child ()
#9  0x080f403a in startup_children ()
#10 0x080f44d8 in ap_mpm_run ()
#11 0x08070e89 in main ()
(gdb) 

I can provide the full core dump if required.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52921] mod_jk 1.2.33 crashes Apache 2.2 when accessing HTML, GIF, etc.

https://issues.apache.org/bugzilla/show_bug.cgi?id=52921

Konstantin Kolinko  changed:

   What|Removed |Added

Version|unspecified |1.2.33

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1301123 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/buf/UDecoder.java webapps/docs/changelog.xml

Author: kkolinko
Date: Thu Mar 15 18:14:44 2012
New Revision: 1301123

URL: http://svn.apache.org/viewvc?rev=1301123&view=rev
Log:
Slightly improve performance of UDecoder
Backports r1203054 from 7.0.x.

- Reduce overhead from exception handling, using 
ProxyDirContext.NOT_FOUND_EXCEPTION as an example.
- Limit second string scan using results from the first one.

The s/findByte()/indexOf()/ change part of r1203054 has not been backported.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.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=1301123&r1=1301122&r2=1301123&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar 15 18:14:44 2012
@@ -69,12 +69,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, rjung, fhanik
   -1:
 
-* Reduce overhead from exception handling in UDecoder
-  http://people.apache.org/~kkolinko/patches/2011-11-17_tc6_UDecoder.patch
-  (r1203054 in TC7)
-  +1: kkolinko,funkman, fhanik
-  -1:
-
 * Align %2f handling between implementations of UDecoder.convert()
   http://svn.apache.org/viewvc?rev=1203091&view=rev
   +1: kkolinko,funkman, fhanik

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1301123&r1=1301122&r2=1301123&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Mar 
15 18:14:44 2012
@@ -33,6 +33,30 @@ public final class UDecoder {
 protected static final boolean ALLOW_ENCODED_SLASH = 
 
Boolean.valueOf(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH",
 "false")).booleanValue();
 
+private static class DecodeException extends CharConversionException {
+private static final long serialVersionUID = 1L;
+public DecodeException(String s) {
+super(s);
+}
+
+@Override
+public synchronized Throwable fillInStackTrace() {
+// This class does not provide a stack trace
+return this;
+}
+}
+
+/** Unexpected end of data. */
+private static final IOException EXCEPTION_EOF = new 
DecodeException("EOF");
+
+/** %xx with not-hex digit */
+private static final IOException EXCEPTION_NOT_HEX_DIGIT = new 
DecodeException(
+"isHexDigit");
+
+/** %-encoded slash is forbidden in resource path */
+private static final IOException EXCEPTION_SLASH = new DecodeException(
+"noSlash");
+
 public UDecoder() 
 {
 }
@@ -57,18 +81,20 @@ public final class UDecoder {
 
 int idx= ByteChunk.indexOf( buff, start, end, '%' );
 int idx2=-1;
-if( query )
-idx2= ByteChunk.indexOf( buff, start, end, '+' );
+if( query ) {
+idx2= ByteChunk.indexOf( buff, start, (idx >= 0 ? idx : end), '+' 
);
+}
 if( idx<0 && idx2<0 ) {
 return;
 }
 
-// idx will be the smallest positive inxes ( first % or + )
-if( idx2 >= 0 && idx2 < idx ) idx=idx2;
-if( idx < 0 ) idx=idx2;
+// idx will be the smallest positive index ( first % or + )
+if( (idx2 >= 0 && idx2 < idx) || idx < 0 ) {
+idx=idx2;
+}
+
+boolean noSlash = !(ALLOW_ENCODED_SLASH || query);
 
-boolean noSlash = !(ALLOW_ENCODED_SLASH || query);
-
 for( int j=idx; j= end ) {
-throw new CharConversionException("EOF");
+throw EXCEPTION_EOF;
 }
 byte b1= buff[j+1];
 byte b2=buff[j+2];
 if( !isHexDigit( b1 ) || ! isHexDigit(b2 ))
-throw new CharConversionException( "isHexDigit");
+throw EXCEPTION_NOT_HEX_DIGIT;
 
 j+=2;
 int res=x2c( b1, b2 );
-if (noSlash && (res == '/')) {
-throw new CharConversionException( "noSlash");
-}
+if (noSlash && (res == '/')) {
+throw EXCEPTION_SLASH;
+}
 buff[idx]=(byte)res;
 }
 }
@@ -122,14 +148,17 @@ public final class UDecoder {
 
 int idx= CharChunk.indexOf( buff, start, cend, '%' );
 int idx2=-1;
-if( query )
-idx2= CharChunk.indexOf( buff, start, cend, '+' );
+if( query ) {
+idx2= CharChunk.indexOf( buff, start, (idx >= 0 ? idx : cend), '+' 
);
+}
 if( idx<0 && idx2<0 ) {
 return

RE: Upgrade Tomcat 6 from ECJ 3.7 to ECJ 3.7.1?

2012/3/15 Nick Williams :
> Good to know. What about the next version of Tomcat 6? Will it also
> get
> 3.7.2 (or at least 3.7.1)? Or will it stay on 3.7.0 for the
> foreseeable future? That's my big concern. As long as Tomcat 6 has
> 3.7.1 or better, it should be able to compile JSPs for Java 7. With
3.7.0, it can't.
>


1. Please do not top-post.

2. There is some time (months?) before next Tomcat 6. I think ECJ version
will be updated.

3. The more people use and say there are no issues, the easier it is to
update.

In your case, to use Java 7 features in JSPs you would have to also
reconfigure JspServlet (using compilerSourceVM / compilerTargetVM
options) to target Java 7.

Best regards,
Konstantin Kolinko

-

I see that the default values for compilerSourceVM and compilerTargetVM
are 1.5 in Tomcat 6 and 1.6 in Tomcat 7. It would need to be changed to
1.7 in both, correct?

I know this is starting to creep out of the scope of this mailing list
somewhat, but is changing these values in $CATALINA_BASE/conf/web.xml the
ONLY way to configure Tomcat to compile with 1.7? Can something not be
specified in web.xml to make it use 1.7 for that particular web
application? Or context.xml? Or anything else?

If there's not another way to configure it, I believe I'll put in an
enhancement request. I know it may be months or years before it gets done,
if ever, but I think it would be a good improvement.

Nick

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

Re: Upgrade Tomcat 6 from ECJ 3.7 to ECJ 3.7.1?

2012/3/15 Nick Williams :
> 2012/3/15 Nick Williams :
>> Good to know. What about the next version of Tomcat 6? Will it also
>> get
>> 3.7.2 (or at least 3.7.1)? Or will it stay on 3.7.0 for the
>> foreseeable future? That's my big concern. As long as Tomcat 6 has
>> 3.7.1 or better, it should be able to compile JSPs for Java 7. With
> 3.7.0, it can't.
>>
>
>
> 1. Please do not top-post.
>
> 2. There is some time (months?) before next Tomcat 6. I think ECJ version
> will be updated.
>
> 3. The more people use and say there are no issues, the easier it is to
> update.
>
> In your case, to use Java 7 features in JSPs you would have to also
> reconfigure JspServlet (using compilerSourceVM / compilerTargetVM
> options) to target Java 7.
>
> Best regards,
> Konstantin Kolinko
>
> -
>
> I see that the default values for compilerSourceVM and compilerTargetVM
> are 1.5 in Tomcat 6 and 1.6 in Tomcat 7. It would need to be changed to
> 1.7 in both, correct?
>
> I know this is starting to creep out of the scope of this mailing list
> somewhat, but is changing these values in $CATALINA_BASE/conf/web.xml the
> ONLY way to configure Tomcat to compile with 1.7? Can something not be
> specified in web.xml to make it use 1.7 for that particular web
> application? Or context.xml? Or anything else?
>

You should be able to copy that  into your web.xml. The only
caveat is that you would have to change its  and to copy its
s as well.

I personally have never done that with JspServlet,  but I often do so
with DefaultServlet e.g. to enable directory listings.


Best regards,
Konstantin Kolinko

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

RE: Upgrade Tomcat 6 from ECJ 3.7 to ECJ 3.7.1?

2012/3/15 Nick Williams :
> 2012/3/15 Nick Williams :
>> Good to know. What about the next version of Tomcat 6? Will it also
>> get
>> 3.7.2 (or at least 3.7.1)? Or will it stay on 3.7.0 for the
>> foreseeable future? That's my big concern. As long as Tomcat 6 has
>> 3.7.1 or better, it should be able to compile JSPs for Java 7. With
> 3.7.0, it can't.
>>
>
>
> 1. Please do not top-post.
>
> 2. There is some time (months?) before next Tomcat 6. I think ECJ
> version will be updated.
>
> 3. The more people use and say there are no issues, the easier it is
> to update.
>
> In your case, to use Java 7 features in JSPs you would have to also
> reconfigure JspServlet (using compilerSourceVM / compilerTargetVM
> options) to target Java 7.
>
> Best regards,
> Konstantin Kolinko
>
> -
>
> I see that the default values for compilerSourceVM and
> compilerTargetVM are 1.5 in Tomcat 6 and 1.6 in Tomcat 7. It would
> need to be changed to
> 1.7 in both, correct?
>
> I know this is starting to creep out of the scope of this mailing list
> somewhat, but is changing these values in $CATALINA_BASE/conf/web.xml
> the ONLY way to configure Tomcat to compile with 1.7? Can something
> not be specified in web.xml to make it use 1.7 for that particular web
> application? Or context.xml? Or anything else?
>

You should be able to copy that  into your web.xml. The only
caveat is that you would have to change its  and to copy its
s as well.

I personally have never done that with JspServlet,  but I often do so with
DefaultServlet e.g. to enable directory listings.


Best regards,
Konstantin Kolinko

-

Gotchya. Doing so, however, would make it non-portable to other
application servers. We'll stick to changing the value in
$CATALINA_BASE/conf/web.xml for now, and I'll put in an enhancement
request based on how the other popular application servers do it. Maybe
somebody will pick it up, maybe not. It never hurts to suggest.

Nick

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

DO NOT REPLY [Bug 51872] request.getRemoteAddr() sometimes returning IP address from the previous request

https://issues.apache.org/bugzilla/show_bug.cgi?id=51872

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #16 from Mark Thomas  2012-03-15 19:07:55 UTC ---
(In reply to comment #15)
> Mark,
> 
> we upgraded from 6.0.29 to 7.0.23 and have exactly the same problem. I can
> certainly exclude an application bug. This method is fundamental!

Again. *This* issue has been fixed. There are multiple possible causes of the
symptom described here and the vast majority of them are application bugs.
Please follow-up on the users-mailing list.

Feel free to create a new bug (since this specific issue is fixed) once you
have one of the following:
- an explanation based on an analysis of the source code of why requests are
getting mixed up
- a reproducible test case that demonstrates the issue

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52500] Improve client certificate authentication

https://issues.apache.org/bugzilla/show_bug.cgi?id=52500

--- Comment #37 from Christopher Schultz  
2012-03-15 19:37:54 UTC ---
(In reply to comment #36)
> Dear Christopher,
> I will really appreciate if you will rename the X509SubjectDnRetriever class 
> to
> X509DefaultSubjectDnRetriever.
> Please, please do it for me – it take about 3 min to do it but will help me a
> lot.

I'm -1 on re-naming that class, since it does just what it says: it returns the
entire SubjectDN as the username: it's not a "default". I would think a better
name for a class that takes part of the SubjectDN would be
X509SubjectDNFieldRetriever.

> BTW, when 7.0.27 will be released?

When it's ready.

7.0.23 was released 2011-11-25
7.0.24 was not released because it was broken
7.0.25 was released 2012-01-21
7.0.26 was released 2012-02-22

I would expect that 7.0.27 will be released within the next 30 days: Mark has
done a great job rolling regular releases.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1301184 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/Globals.java

Author: markt
Date: Thu Mar 15 20:31:59 2012
New Revision: 1301184

URL: http://svn.apache.org/viewvc?rev=1301184&view=rev
Log:
Simplify merge-info
Port additional constants

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 20:31:59 2012
@@ -1 +1 @@
-/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-1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692
 
,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232
 
447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948
+/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,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101
 
,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,123162

DO NOT REPLY [Bug 52921] mod_jk 1.2.33 crashes Apache 2.2 when accessing HTML, GIF, etc.

https://issues.apache.org/bugzilla/show_bug.cgi?id=52921

--- Comment #1 from Rainer Jung  2012-03-15 20:40:13 
UTC ---
Are you able to build mod_jk with symbols, e.g. adding "-g" to your gcc flags?
That way gdb would show us the line number where the crash happens.

Furthermore the request you used for reproduction is for "/~thad/". Does it
also happen if you directly retrieve a mapped URL explicitely, like e.g. an
index.jsp or similar, and on the other hand a non mapped object directly, like
an index.txt?

I will try to reproduce tomorrow.

Regards,

Rainer

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1301190 - /tomcat/tc7.0.x/trunk/

Author: markt
Date: Thu Mar 15 20:45:02 2012
New Revision: 1301190

URL: http://svn.apache.org/viewvc?rev=1301190&view=rev
Log:
Simplify merge-info

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 20:45:02 2012
@@ -1 +1 @@
-/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,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101
 
,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239
 
060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948
+/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,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546
 
,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302

Re: svn commit: r1301123 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/buf/UDecoder.java webapps/docs/changelog.xml

2012-03-15 Thread Christopher Schultz

Konstantin,

On 3/15/12 2:14 PM, kkoli...@apache.org wrote:
> Author: kkolinko
> Date: Thu Mar 15 18:14:44 2012
> New Revision: 1301123
> 
> URL: http://svn.apache.org/viewvc?rev=1301123&view=rev
> Log:
> Slightly improve performance of UDecoder
> Backports r1203054 from 7.0.x.

[Snip]

> +/** Unexpected end of data. */
> +private static final IOException EXCEPTION_EOF = new 
> DecodeException("EOF");
> +
> +/** %xx with not-hex digit */
> +private static final IOException EXCEPTION_NOT_HEX_DIGIT = new 
> DecodeException(
> +"isHexDigit");
> +
> +/** %-encoded slash is forbidden in resource path */
> +private static final IOException EXCEPTION_SLASH = new DecodeException(
> +"noSlash");

When using static Exception objects, doesn't that completely mess with
the stack trace?

-chris



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r1301123 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/buf/UDecoder.java webapps/docs/changelog.xml

2012/3/16 Christopher Schultz :
> Konstantin,
>
> On 3/15/12 2:14 PM, kkoli...@apache.org wrote:
>> Author: kkolinko
>> Date: Thu Mar 15 18:14:44 2012
>> New Revision: 1301123
>>
>> URL: http://svn.apache.org/viewvc?rev=1301123&view=rev
>> Log:
>> Slightly improve performance of UDecoder
>> Backports r1203054 from 7.0.x.
>
> [Snip]
>
>> +    /** Unexpected end of data. */
>> +    private static final IOException EXCEPTION_EOF = new 
>> DecodeException("EOF");
>> +
>> +    /** %xx with not-hex digit */
>> +    private static final IOException EXCEPTION_NOT_HEX_DIGIT = new 
>> DecodeException(
>> +            "isHexDigit");
>> +
>> +    /** %-encoded slash is forbidden in resource path */
>> +    private static final IOException EXCEPTION_SLASH = new DecodeException(
>> +            "noSlash");
>
> When using static Exception objects, doesn't that completely mess with
> the stack trace?
>

Parameter parsing cannot throw exceptions in Servlet API. All of those
exceptions are caught and discarded. Stack trace was not visible there
unless you turned on the debugging.

The DecodeException class used there overrides fillInStackTrace() so
that no time is wasted to fill in the stack trace. No messed stack is
printed - it is not printed at all.

Just exception text will be different.

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: r1301200 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/tribes/group/interceptors/ test/org/apache/catalina/comet/

Author: markt
Date: Thu Mar 15 21:05:13 2012
New Revision: 1301200

URL: http://svn.apache.org/viewvc?rev=1301200&view=rev
Log:
Simplify merge-info
Back-port some clean-up

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 21:05:13 2012
@@ -1 +1 @@
-/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,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546
 
,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244
 
935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948
+/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-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542
 
-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,129628

svn commit: r1301210 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/deploy/ContextHandler.java java/org/apache/catalina/deploy/ResourceBase.java java/org/apache/catalina/manager/HTMLManagerSe

Author: markt
Date: Thu Mar 15 21:22:10 2012
New Revision: 1301210

URL: http://svn.apache.org/viewvc?rev=1301210&view=rev
Log:
Simplify merge-info
Port some:
- use of final
- whitespace clean-up

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ContextHandler.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ResourceBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 21:22:10 2012
@@ -1 +1 @@
-/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-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542
 
-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298
 
592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948
+/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-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547
 
,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298
 794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/ContextHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/depl

DO NOT REPLY [Bug 52921] mod_jk 1.2.33 crashes Apache 2.2 when accessing HTML, GIF, etc.

https://issues.apache.org/bugzilla/show_bug.cgi?id=52921

--- Comment #2 from Thad Humphries  2012-03-15 
21:24:04 UTC ---
This happens if I directly retrieve a mapped URL explicitly.

Mounts made with JkMount work fine. "JkMount /*.jsp ajp13" and "JkMount
/*/servlet/* ajp13" allow me to run the Tomcat examples, as do my JkMount's
apps.

Oddly, HTML and images placed directly under the server root
(/srv/apache2.2.22/htdocs) display fine. Those same files placed in another
directory will not display though the directory has been Alias'ed (the files
display fine if mod_jk/1.2.32 is loaded vs 1.2.33).

Apache's manual, Alias'ed as manual, will not display with mod_jk/1.2.33 loaded
but will with 1.2.33.

I will rebuild mod_jk with the -g option on Monday and provide you the
backtrace then.

Thanks.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52924] New: Add support for per-application JSP compile configuration in Tomcat 6, 7

https://issues.apache.org/bugzilla/show_bug.cgi?id=52924

 Bug #: 52924
   Summary: Add support for per-application JSP compile
configuration in Tomcat 6, 7
   Product: Tomcat 6
   Version: unspecified
  Platform: All
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: nicho...@nicholaswilliams.net
Classification: Unclassified


Created attachment 28477
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28477
Sample tomcat-web.xml file, similar to glassfish-web.xml file

Some of the more popular application servers (GlassFish, WebLogic and
WebSphere) provide easy methods for controlling JSP configuration parameters on
a per-application basis.

Tomcat 7, for example, can run on Java 7, but the default JSP compile level is
1.6, and in order to support compiling JSPs for Java 7, you have to change the
value of compileSourceVM and compileTargetVM for the entire server in
$CATALINA_BASE/conf/web.xml (affects everything) or redeclare the JspServlet in
your web.xml file (not portable to other application servers).

I propose a tomcat-web.xml file specification (similar to GlassFish 3.x's
glassfish-web.xml file specification) that enables configuration of certain
Tomcat-specific application properties. We can start off with just a few
options and over time could make Tomcat much more powerful as we find other
options to put in there.

I propose that the first setting supported in this file be a JSP compile level
(1.5, 1.6, 1.7, etc.).

I propose that the second setting supported be the ability to precompile JSPs
on application startup (a feature not currently supported without significant
configuration/work).

I have attached a sample tomcat-web.xml file that could potentially be used
(very similar to GlassFish equivalent).

It would be great if this could be added to Tomcat 6 AND Tomcat 7, but if
Tomcat 6 is out of the question, go ahead and move this enhancement suggestion
to Tomcat 7.

Maybe possible is that it supports only the JSP language level in Tomcat 6 and
supports more in Tomcat 7?

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52925] New: Upgrade Tomcat 6 to ECJ 3.7.2

https://issues.apache.org/bugzilla/show_bug.cgi?id=52925

 Bug #: 52925
   Summary: Upgrade Tomcat 6 to ECJ 3.7.2
   Product: Tomcat 6
   Version: unspecified
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: nicho...@nicholaswilliams.net
Classification: Unclassified


Tomcat 6.0.35 currently has ECJ version 3.7 (3.7.0) in it.

Tomcat 7.0.25 has ECJ version 3.7.1.

After discussing with Konstantin Kolinko on the developer list earlier today,
he found that ECJ 3.7.2 had been released and put it in the libs directory for
the next version of Tomcat 7, but not Tomcat 6.

Consider this my official request to do the same for Tomcat 6, and upgrade it
to ECJ version 3.7.2.

Reasoning: Tomcat 7.0.25 can run on Java 7 out of the box, and with a simple
change to compileSourceVM and compileTargetVM in $CATALINA_BASE/conf/web.xml
can compile JSPs for Java 7. Tomcat 6.0.35 can also run on Java 7 out of the
box, but changing compileSourceVM and compileTargetVM to Java 7 will not work,
because ECJ did not support Java 7 until ECJ 3.7.1.

Cons: I can't see any reasons (off the bat) NOT to do this. It's possible other
people might know of reasons not to upgrade the next version of Tomcat 6 to ECJ
3.7.2.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1301221 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/buf/UDecoder.java webapps/docs/changelog.xml

Author: kkolinko
Date: Thu Mar 15 21:47:30 2012
New Revision: 1301221

URL: http://svn.apache.org/viewvc?rev=1301221&view=rev
Log:
- Align %2f handling (aka CVE-2007-0450 fix) between implementations of 
UDecoder.convert().
That is: reject '%2f' if Tomcat is configured to do so.
- convert(MessageBytes): Make it to consistently throw an IOException on 
decoding errors,
regardless of what is behind the MessageBytes facade. If there was a
String it was re-throwing RuntimeException from convert(String).
- convert(String): Use StringBuilder

convert(String) and convert(CharChunk) are rare cases with little impact
(and inherent bug: %xx are converted from chars to chars, effectively treating 
them as ISO-8859-1 regardless of request encoding).

It is merge of r1203091 from trunk.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 21:47:30 2012
@@ -1,3 +1,3 @@
 /tomcat/tc6.0.x/trunk:1224802
 /tomcat/tc7.0.x/trunk:1224802,1243045
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,77
 
0809,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,8901
 
39,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,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1

svn commit: r1301227 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ContextConfig.java java/org/apache/catalina/startup/Tomcat.java java/org/apache/jasper/xmlparser/ParserUtils.java

Author: markt
Date: Thu Mar 15 21:59:06 2012
New Revision: 1301227

URL: http://svn.apache.org/viewvc?rev=1301227&view=rev
Log:
Simplify merge-info
Backport some additional finals

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 21:59:06 2012
@@ -1 +1 @@
-/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-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547
 
,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298
 794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948
+/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-1222328,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,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121
 
,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1301227&r1=1301226&r2=1301227&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
Thu Mar 15 21:59:06 2012
@@ -209,14 +209,14 @@ public class ContextConfig implements Li
 /**
  * Map of ServletContainerInitializer to classes they expressed interest 
in.
  */
-protected Map>> 
initializerClassMap

DO NOT REPLY [Bug 52925] Upgrade Tomcat 6 to ECJ 3.7.2

https://issues.apache.org/bugzilla/show_bug.cgi?id=52925

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
Version|unspecified |6.0.35
 Resolution||DUPLICATE
   Severity|normal  |enhancement

--- Comment #1 from Konstantin Kolinko  2012-03-15 
22:03:12 UTC ---


*** This bug has been marked as a duplicate of bug 52805 ***

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52805] Update to ECJ 3.7.2

https://issues.apache.org/bugzilla/show_bug.cgi?id=52805

Konstantin Kolinko  changed:

   What|Removed |Added

 CC||nicholas@nicholaswilliams.n
   ||et

--- Comment #1 from Konstantin Kolinko  2012-03-15 
22:03:12 UTC ---
*** Bug 52925 has been marked as a duplicate of this bug. ***

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1301253 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/util/ java/org/apache/catalina/websocket/ java/org/apache/coyote/ java/org/apache/coyot

Author: markt
Date: Thu Mar 15 22:40:37 2012
New Revision: 1301253

URL: http://svn.apache.org/viewvc?rev=1301253&view=rev
Log:
Start to merge WebSocket implementation from trunk. I'm combining commits where 
I can but I can't back-port in a single commit as they interleave with other 
commits.

Added:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Conversions.java
  - copied unchanged from r1239047, 
tomcat/trunk/java/org/apache/catalina/util/Conversions.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/
  - copied from r1239047, tomcat/trunk/java/org/apache/catalina/websocket/
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/UpgradeInbound.java
  - copied unchanged from r1239047, 
tomcat/trunk/java/org/apache/coyote/http11/UpgradeInbound.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/UpgradeInputStream.java
  - copied unchanged from r1239047, 
tomcat/trunk/java/org/apache/coyote/http11/UpgradeInputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/UpgradeOutbound.java
  - copied unchanged from r1239047, 
tomcat/trunk/java/org/apache/coyote/http11/UpgradeOutbound.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/UpgradeOutputStream.java
  - copied unchanged from r1239047, 
tomcat/trunk/java/org/apache/coyote/http11/UpgradeOutputStream.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/
  - copied from r1239047, tomcat/trunk/test/org/apache/catalina/websocket/
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/
  - copied from r1239047, 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/
tomcat/tc7.0.x/trunk/webapps/examples/websocket/
  - copied from r1239047, tomcat/trunk/webapps/examples/websocket/
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ActionCode.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml
tomcat/tc7.0.x/trunk/webapps/examples/index.html

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 22:40:37 2012
@@ -1 +1 @@
-/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-1222328,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,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121
 
,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948
+/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-11

svn commit: r1301255 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/servlets/ java/org/apache/cata

Author: markt
Date: Thu Mar 15 22:47:40 2012
New Revision: 1301255

URL: http://svn.apache.org/viewvc?rev=1301255&view=rev
Log:
Backport use of constants

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/Constants.java

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 22:47:40 2012
@@ -1 +1 @@
-/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-1222328,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,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121
 
,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948
+/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-1222328,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,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118
 
,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1301255&r1=1301254&r2=1301255&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java Thu Mar 15 
22:47:40 2012
@@ -169,7 +169,9 @@ public final class Globals {
  * All request attributes which names start with this prefix are used by
  * connector implementat

svn commit: r1301256 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/manager-howto.xml

Author: markt
Date: Thu Mar 15 22:49:06 2012
New Revision: 1301256

URL: http://svn.apache.org/viewvc?rev=1301256&view=rev
Log:
Added support to the JMXProxyServlet for fetching a specific key from a 
CompositeData value.
Added documentation for the entire 'get' command for the JMXProxyServlet, 
including the new optional 'key' parameter.
Backport of patch by schultz

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 22:49:06 2012
@@ -1 +1 @@
-/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-1222328,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,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118
 
,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948
+/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-1222328,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,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1296284,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020,1299034,1299819,1300154-1300155,1300569,1300948

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=1301256&r1=1301255&r2=1301256&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java 
Thu Mar 15 22:49:06 2012
@@ -25,6 +25,7 @@ import javax.management.MBeanOperationIn
 import javax.management.MBeanParameterInfo;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+import javax.management.openmbean.CompositeData;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -97,7 +98,7 @@ public class JMXProxyServlet extends Htt
 qry=request.getParameter("get");
 if( qry!= null ) {
 String name=request.getParameter("att");
-g

buildbot failure in ASF Buildbot on tomcat-7-trunk

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

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1301253
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot




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

Re: buildbot failure in ASF Buildbot on tomcat-7-trunk

2012/3/16  :
> 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/473
>
> Buildbot URL: http://ci.apache.org/
>
> Buildslave for this Build: bb-vm_ubuntu
>
> Build Reason: scheduler
> Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1301253
> Blamelist: markt
>
> BUILD FAILED: failed compile_1
>

Buildbot runs tests for 7.0.x !

The only failed test:
org.apache.catalina.websocket.TestWebSocket x BIO, NIO.

Logs -> http://ci.apache.org/projects/tomcat/tomcat7/logs/

http://ci.apache.org/projects/tomcat/tomcat7/logs/1301253/TEST-org.apache.catalina.websocket.TestWebSocket.BIO.txt
http://ci.apache.org/projects/tomcat/tomcat7/logs/1301253/TEST-org.apache.catalina.websocket.TestWebSocket.NIO.txt

Both are
[[[
Testcase: initializationError took 0.001 sec
Caused an ERROR
No runnable methods
java.lang.Exception: No runnable methods
at java.lang.reflect.Constructor.newInstance(Constructor.java:513)
]]]

I think Mark will backport the fix in one of subsequent commits.
http://svn.apache.org/viewvc?view=revision&revision=1239295

Best regards,
Konstantin Kolinko

-
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

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

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1301256
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot

Re: svn commit: r1300573 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default res/ide-support/eclipse/eclipse.classpath webapps/docs/changelog.xml

2012/3/14  :
> Author: markt
> Date: Wed Mar 14 14:51:56 2012
> New Revision: 1300573
>
> URL: http://svn.apache.org/viewvc?rev=1300573&view=rev
> Log:
> Update to JDT 3.7.2
>
> Modified:
>    tomcat/tc7.0.x/trunk/   (props changed)
>    tomcat/tc7.0.x/trunk/build.properties.default
>    tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
>    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>
> Propchange: tomcat/tc7.0.x/trunk/
> --
> (...)
>
> Modified: tomcat/tc7.0.x/trunk/build.properties.default
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1300573&r1=1300572&r2=1300573&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/build.properties.default (original)
> +++ tomcat/tc7.0.x/trunk/build.properties.default Wed Mar 14 14:51:56 2012
> @@ -123,8 +123,8 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/
>  wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
>
>  # - Eclipse JDT, version 3.2 or later -
> -jdt.version=3.7.1
> -jdt.release=R-3.7.1-201109091335
> +jdt.version=3.7.2
> +jdt.release=R-3.7.2-201202080800
>  jdt.home=${base.path}/ecj-${jdt.version}
>  jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
>  # The download will be moved to the archive area eventually. We are taking 
> care of that in advance.
>
> Modified: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1300573&r1=1300572&r2=1300573&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath (original)
> +++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath Wed Mar 14 
> 14:51:56 2012
> @@ -25,6 +25,6 @@
>      path="TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/tomcat-dbcp.jar" 
> sourcepath="/TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/src/java"/>
>      path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
>      path="TOMCAT_LIBS_BASE/wsdl4j-1.6.2/wsdl4j-1.6.2.jar"/>
> -     path="TOMCAT_LIBS_BASE/ecj-3.7.1/ecj-3.7.1.jar"/>
> +     path="TOMCAT_LIBS_BASE/ecj-3.7.2/ecj-3.7.2.jar"/>
>     
>  
>
> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1300573&r1=1300572&r2=1300573&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Mar 14 14:51:56 2012
> @@ -185,6 +185,9 @@
>         Update the native component of the Tomcat APR/native connector to
>         1.1.23 and take advantage of the simplified distribution. (mturk)
>       
> +      
> +        Update to Eclipse JDT Compiler 3.7.2. (markt)
> +      
>     
>   
>  
>

There is one more place where ecj version is mentioned:

res/maven/tomcat-jasper.pom
has


  org.eclipse.jdt.core.compiler
  ecj
  3.7


Though searching for it I currently see only version 3.7.1 as the latest:
http://search.maven.org/#search|ga|1|g%3A%22org.eclipse.jdt.core.compiler%22

I do not mind updating it here (I guess someone will upload it if it
is really needed). I do not have configuration to test
whether "ant -f mvn-pub.xml" build would break if we update the
version in that file now.

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: r1301269 - /tomcat/tc7.0.x/trunk/build.xml

Author: markt
Date: Thu Mar 15 23:38:45 2012
New Revision: 1301269

URL: http://svn.apache.org/viewvc?rev=1301269&view=rev
Log:
Cache downloaded files

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

Modified: tomcat/tc7.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1301269&r1=1301268&r2=1301269&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Thu Mar 15 23:38:45 2012
@@ -1538,8 +1538,8 @@
 
 
   
-
-
+
+
   
 
 
@@ -2345,6 +2345,7 @@ Apache Tomcat ${version} native binaries
 
   
   
+  
   
 
 



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

svn commit: r1301271 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/session/ManagerBase.java res/findbugs/filter-false-positives.xml

Author: markt
Date: Thu Mar 15 23:40:44 2012
New Revision: 1301271

URL: http://svn.apache.org/viewvc?rev=1301271&view=rev
Log:
Exclude warning with comment
Add some finals

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc7.0.x/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1301271&r1=1301270&r2=1301271&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Thu 
Mar 15 23:40:44 2012
@@ -145,16 +145,16 @@ public abstract class ManagerBase extend
 
 protected static final int TIMING_STATS_CACHE_SIZE = 100;
 
-protected Deque sessionCreationTiming =
+protected final Deque sessionCreationTiming =
 new LinkedList();
 
-protected Deque sessionExpirationTiming =
+protected final Deque sessionExpirationTiming =
 new LinkedList();
 
 /**
  * Number of sessions that have expired.
  */
-protected AtomicLong expiredSessions = new AtomicLong(0);
+protected final AtomicLong expiredSessions = new AtomicLong(0);
 
 
 /**
@@ -211,7 +211,8 @@ public abstract class ManagerBase extend
 /**
  * The property change support for this component.
  */
-protected PropertyChangeSupport support = new PropertyChangeSupport(this);
+protected final PropertyChangeSupport support =
+new PropertyChangeSupport(this);
 
 
 // - Properties
@@ -796,6 +797,9 @@ public abstract class ManagerBase extend
 
 do {
 if (result != null) {
+// Not thread-safe but if one of multiple increments is lost
+// that is not a big deal since the fact that there was any
+// duplicate is a much bigger issue.
 duplicates++;
 }
 
@@ -1308,8 +1312,8 @@ public abstract class ManagerBase extend
 // --- Inner 
classes
 
 protected static final class SessionTiming {
-private long timestamp;
-private int duration;
+private final long timestamp;
+private final int duration;
 
 public SessionTiming(long timestamp, int duration) {
 this.timestamp = timestamp;

Modified: tomcat/tc7.0.x/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/findbugs/filter-false-positives.xml?rev=1301271&r1=1301270&r2=1301271&view=diff
==
--- tomcat/tc7.0.x/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/tc7.0.x/trunk/res/findbugs/filter-false-positives.xml Thu Mar 15 
23:40:44 2012
@@ -89,6 +89,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 



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

svn commit: r1301272 - in /tomcat/tc7.0.x/trunk/java/org/apache: catalina/session/ catalina/users/ catalina/valves/ jasper/ jasper/compiler/

Author: markt
Date: Thu Mar 15 23:41:08 2012
New Revision: 1301272

URL: http://svn.apache.org/viewvc?rev=1301272&view=rev
Log:
Add finals

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1301272&r1=1301271&r2=1301272&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardManager.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardManager.java 
Thu Mar 15 23:41:08 2012
@@ -107,7 +107,7 @@ public class StandardManager extends Man
 /**
  * The descriptive name of this Manager implementation (for logging).
  */
-protected static String name = "StandardManager";
+protected static final String name = "StandardManager";
 
 
 /**

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=1301272&r1=1301271&r2=1301272&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java 
Thu Mar 15 23:41:08 2012
@@ -58,9 +58,7 @@ public class MemoryUserDatabase implemen
  * Create a new instance with default values.
  */
 public MemoryUserDatabase() {
-
-super();
-
+this(null);
 }
 
 
@@ -70,10 +68,7 @@ public class MemoryUserDatabase implemen
  * @param id Unique global identifier of this user database
  */
 public MemoryUserDatabase(String id) {
-
-super();
 this.id = id;
-
 }
 
 
@@ -84,13 +79,13 @@ public class MemoryUserDatabase implemen
  * The set of {@link Group}s defined in this database, keyed by
  * group name.
  */
-protected HashMap groups = new HashMap();
+protected final HashMap groups = new HashMap();
 
 
 /**
  * The unique global identifier of this user database.
  */
-protected String id = null;
+protected final String id;
 
 
 /**
@@ -123,7 +118,7 @@ public class MemoryUserDatabase implemen
  * The set of {@link Role}s defined in this database, keyed by
  * role name.
  */
-protected HashMap roles = new HashMap();
+protected final HashMap roles = new HashMap();
 
 
 /**
@@ -137,7 +132,7 @@ public class MemoryUserDatabase implemen
  * The set of {@link User}s defined in this database, keyed by
  * user name.
  */
-protected HashMap users = new HashMap();
+protected final HashMap users = new HashMap();
 
 
 // - Properties

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=1301272&r1=1301271&r2=1301272&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
 Thu Mar 15 23:41:08 2012
@@ -73,14 +73,14 @@ public class CometConnectionManagerValve
 /**
  * List of current Comet connections.
  */
-protected List cometRequests =
+protected final List cometRequests =
 Collections.synchronizedList(new ArrayList());
 
 
 /**
  * Name of session attribute used to store list of comet connections.
  */
-protected String cometRequestsAttribute =
+protected final String cometRequestsAttribute =
 "org.apache.tomcat.comet.connectionList";
 
 

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1301272&r1=1301271&r2=1301272&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java Thu Mar 15 23:41:08 
2012
@@ -171,7 +171,7 @@ public class JspC implements Options {
 protected boolean smapSuppressed = true;

svn commit: r1301274 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/websocket/WebSocketServlet.java

Author: markt
Date: Thu Mar 15 23:44:08 2012
New Revision: 1301274

URL: http://svn.apache.org/viewvc?rev=1301274&view=rev
Log:
Final WebSocket change

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 23:44:08 2012
@@ -1 +1 @@
-/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-1222328,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,1300154-1300155,1300569,1300948
+/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-1222328,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,1300111-1300460,1300520-1300948

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1301274&r1=1301273&r2=1301274&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java 
Thu Mar 15 23:44:08 2012
@@ -215,7 +215,6 @@ public abstract class WebSocketServlet e
  *
  * @param subProtocol   The sub-protocol agreed between the client and
  *  server or null if none was agreed
- * @return
  */
 protected abstract StreamInbound createWebSocketInbound(String 
subProtocol);
 }



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

svn commit: r1301280 - in /tomcat/trunk/webapps/examples: WEB-INF/ WEB-INF/classes/websocket/ WEB-INF/classes/websocket/chat/ WEB-INF/classes/websocket/echo/ WEB-INF/classes/websocket/snake/ websocket

Author: markt
Date: Thu Mar 15 23:53:01 2012
New Revision: 1301280

URL: http://svn.apache.org/viewvc?rev=1301280&view=rev
Log:
Implement chat example
Plus some minor clean-up.
Patch provided by Johno Crawford

Added:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/

tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java
   (with props)
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/

tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
  - copied, changed from r1300930, 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.java
  - copied, changed from r1300930, 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoStream.java
Removed:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/EchoStream.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java

tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java
tomcat/trunk/webapps/examples/WEB-INF/web.xml
tomcat/trunk/webapps/examples/websocket/echo.html
tomcat/trunk/webapps/examples/websocket/index.html
tomcat/trunk/webapps/examples/websocket/snake.html

Added: 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java?rev=1301280&view=auto
==
--- 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java
 (added)
+++ 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java
 Thu Mar 15 23:53:01 2012
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package websocket.chat;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.catalina.websocket.MessageInbound;
+import org.apache.catalina.websocket.StreamInbound;
+import org.apache.catalina.websocket.WebSocketServlet;
+import org.apache.catalina.websocket.WsOutbound;
+
+import util.HTMLFilter;
+
+/**
+ * Example web socket servlet for chat.
+ */
+public class ChatWebSocketServlet extends WebSocketServlet {
+
+private static final long serialVersionUID = 1L;
+
+private static final String GUEST_PREFIX = "Guest";
+
+private final AtomicInteger connectionIds = new AtomicInteger(0);
+private final Set connections =
+new CopyOnWriteArraySet();
+
+@Override
+protected StreamInbound createWebSocketInbound(String subProtocol) {
+return new ChatMessageInbound(connectionIds.incrementAndGet());
+}
+
+private final class ChatMessageInbound extends MessageInbound {
+
+private final String nickname;
+
+private ChatMessageInbound(int id) {
+this.nickname = GUEST_PREFIX + id;
+}
+
+@Override
+protected void onOpen(WsOutbound outbound) {
+connections.add(this);
+String message = String.format("* %s %s",
+nickname, "has joined.");
+broadcast(message);
+}
+
+@Override
+protected void onClose(int status) {
+connections.remove(this);
+String message = String.format("* %s %s",
+nickname, "has disconnected.");
+broadcast(message);
+}
+
+@Override
+protected void onBinaryMessage(ByteBuffer message) throws IOException {
+throw new UnsupportedOperationException(
+"Binary message not supported.");
+}
+
+@Override
+protected void onTextMessage(CharBuffer message) throws IOException {
+// Never trust the client
+String filteredMessage = String.format("%s: %s",
+nickname,

svn commit: r1301284 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/ webapps/examples/WEB-INF/ webapps/examples/WEB-INF/classes/websocket/ webapps/examples/WEB-INF/classes/websocket/chat/ webapps/example

Author: markt
Date: Thu Mar 15 23:57:00 2012
New Revision: 1301284

URL: http://svn.apache.org/viewvc?rev=1301284&view=rev
Log:
Implement chat example
Plus some minor clean-up.
Patch provided by Johno Crawford

Added:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/chat/
  - copied from r1301280, 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/
  - copied from r1301280, 
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/
Removed:

tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/EchoMessage.java

tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/EchoStream.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java

tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml
tomcat/tc7.0.x/trunk/webapps/examples/websocket/echo.html
tomcat/tc7.0.x/trunk/webapps/examples/websocket/index.html
tomcat/tc7.0.x/trunk/webapps/examples/websocket/snake.html

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 23:57:00 2012
@@ -1 +1 @@
-/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-1222328,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,1300111-1300460,1300520-1300948
+/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-1222328,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,1300111-1300460,1300520-1300948,1301280

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1301284&r1=1301283&r2=1301284&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 15 23:57:00 2012
@@ -100,6 +100,14 @@
 work with IBM as well as Oracle JVMs. Patch provided by Rohit Kelapure.
 (markt)
   
+  
+Add support for the WebSocket protocol (RFC6455). Both streaming and
+message based APIs are provided and the implementation currently fully
+passes the Autobahn test suite. Also included are several examples.
+A significant contribution to this new functionality was provided by
+Johno Crawford - particularly the examples. Contributions were also
+provided by Petr P

DO NOT REPLY [Bug 52805] Update to ECJ 3.7.2

https://issues.apache.org/bugzilla/show_bug.cgi?id=52805

--- Comment #2 from Konstantin Kolinko  2012-03-15 
23:57:33 UTC ---
Created attachment 28478
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=28478
2012-03-16_tc6_52805_ecj372.patch

In 7.0.x it was fixed by r1300573

I am attaching patch for 6.0.x.

A caveat is that the patch updates res/maven/jasper.pom, but I do not see
"org.eclipse.jdt.core.compiler" version 3.7.2 being available from Maven
Central now [1].

[1]
http://search.maven.org/#search|ga|1|g%3A%22org.eclipse.jdt.core.compiler%22

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 51181] Add support for Web Sockets

https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #61 from Mark Thomas  2012-03-15 23:58:36 UTC ---
WebSocket support has now been back-ported to 7.0.x and will be included in
7.0.27 onwards.

To prevent what is already a fairly lengthy issue becoming longer, bugs in the
implementation, requests for new features, patches etc. should be provided via
new bugzilla issues rather than re-opening this one.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

buildbot failure in ASF Buildbot on tomcat-7-trunk

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

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1301274
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: r1301293 - /tomcat/tc6.0.x/trunk/STATUS.txt

Author: kkolinko
Date: Fri Mar 16 00:19:48 2012
New Revision: 1301293

URL: http://svn.apache.org/viewvc?rev=1301293&view=rev
Log:
propose ECJ update

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=1301293&r1=1301292&r2=1301293&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 16 00:19:48 2012
@@ -164,7 +164,13 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52918
   Add WebSocket support to Tomcat 6
   +1: fhanik
-
+
+* Update to Eclipse JDT Compiler 3.7.2.
+  https://issues.apache.org/bugzilla/show_bug.cgi?id=52805
+  Patch: https://issues.apache.org/bugzilla/attachment.cgi?id=28478
+  +1: kkolinko
+  -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

DO NOT REPLY [Bug 52805] Update to ECJ 3.7.2

https://issues.apache.org/bugzilla/show_bug.cgi?id=52805

Konstantin Kolinko  changed:

   What|Removed |Added

  Component|Jasper  |Jasper
Version|trunk   |6.0.35
Product|Tomcat 7|Tomcat 6
   Target Milestone|--- |default

--- Comment #3 from Konstantin Kolinko  2012-03-16 
00:23:00 UTC ---
Patch was proposed for 6.0.x.

Moving the issue to Tomcat 6, because it is already fixed in 7.0.x.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

buildbot failure in ASF Buildbot on tomcat-trunk

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

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1301280
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

DO NOT REPLY [Bug 51181] Add support for Web Sockets

https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #62 from Konstantin Kolinko  2012-03-16 
00:54:29 UTC ---
Just a note:
Backport of WebSockets support to Tomcat 6 is tracked separately as bug #52918

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1301301 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml

Author: kkolinko
Date: Fri Mar 16 01:10:42 2012
New Revision: 1301301

URL: http://svn.apache.org/viewvc?rev=1301301&view=rev
Log:
Add link to JUnit reports published by Buildbot.
https://issues.apache.org/jira/browse/INFRA-3948

Modified:
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/xdocs/ci.xml

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1301301&r1=1301300&r2=1301301&view=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Fri Mar 16 01:10:42 2012
@@ -374,6 +374,10 @@ prepared and published by ASF Buildbot, 
 
   
 
+http://ci.apache.org/projects/tomcat/tomcat8/logs/"; 
rel="nofollow">JUnit logs
+   by revision number. The recent ones are at the bottom.
+  
+
 http://ci.apache.org/projects/tomcat/tomcat8/rat-output.html"; 
rel="nofollow">RAT report
 
 
@@ -412,6 +416,10 @@ prepared and published by ASF Buildbot, 
 
   
 
+http://ci.apache.org/projects/tomcat/tomcat7/logs/"; 
rel="nofollow">JUnit logs
+   by revision number. The recent ones are at the bottom.
+  
+
 http://ci.apache.org/projects/tomcat/tomcat7/rat-output.html"; 
rel="nofollow">RAT report
 
 

Modified: tomcat/site/trunk/xdocs/ci.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1301301&r1=1301300&r2=1301301&view=diff
==
--- tomcat/site/trunk/xdocs/ci.xml (original)
+++ tomcat/site/trunk/xdocs/ci.xml Fri Mar 16 01:10:42 2012
@@ -65,6 +65,8 @@ prepared and published by ASF Buildbot, 
   http://ci.apache.org/projects/tomcat/tomcat8/"; 
rel="nofollow">Files
 
   http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html"; 
rel="nofollow">Documentation
+  http://ci.apache.org/projects/tomcat/tomcat8/logs/"; 
rel="nofollow">JUnit logs
+   by revision number. The recent ones are at the bottom.
   http://ci.apache.org/projects/tomcat/tomcat8/rat-output.html"; 
rel="nofollow">RAT report
 
   
@@ -81,6 +83,8 @@ prepared and published by ASF Buildbot, 
   http://ci.apache.org/projects/tomcat/tomcat7/"; 
rel="nofollow">Files
 
   http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html"; 
rel="nofollow">Documentation
+  http://ci.apache.org/projects/tomcat/tomcat7/logs/"; 
rel="nofollow">JUnit logs
+   by revision number. The recent ones are at the bottom.
   http://ci.apache.org/projects/tomcat/tomcat7/rat-output.html"; 
rel="nofollow">RAT report
 
   



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

svn commit: r1301302 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Author: kkolinko
Date: Fri Mar 16 01:22:09 2012
New Revision: 1301302

URL: http://svn.apache.org/viewvc?rev=1301302&view=rev
Log:
Fix broken changelog.xml with s/&/&/

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1301302&r1=1301301&r2=1301302&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Mar 16 01:22:09 2012
@@ -105,8 +105,8 @@
 message based APIs are provided and the implementation currently fully
 passes the Autobahn test suite. Also included are several examples.
 A significant contribution to this new functionality was provided by
-Johno Crawford - particularly the examples. Contributions were also
-provided by Petr Praus, Jonathan Drake & SlÃ¡vka. (markt)
+Johno Crawford — particularly the examples. Contributions were
+also provided by Petr Praus, Jonathan Drake & SlÃ¡vka. (markt)
   
 
   



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

DO NOT REPLY [Bug 52853] @HandlesTypes not resolving classes when added as repository directory

https://issues.apache.org/bugzilla/show_bug.cgi?id=52853

--- Comment #5 from Benjamin Muschko  2012-03-16 
01:39:34 UTC ---
I will try to provide an example that runs an embedded container. I had a look
at this repository https://github.com/apache/tomcat70 but couldn't find an
example for running tests on an embedded Tomcat container. Is there an already
existing setup that I can retrofit to start up an embedded container (including
added the embedded Tomcat JARs to the classpath)?

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

buildbot success in ASF Buildbot on tomcat-7-trunk

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

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1301302
Blamelist: kkolinko

Build succeeded!

sincerely,
 -The Buildbot

DO NOT REPLY [Bug 52899] JMXProxy Servlet MBeanDumper exposing non-properties causing exceptions/memory leak

https://issues.apache.org/bugzilla/show_bug.cgi?id=52899

--- Comment #2 from Jonathan Hodges  2012-03-16 02:31:11 UTC 
---
Why does the exact same config not throw an exception in the JMXProxy in Tomcat
6.0.26?



(In reply to comment #1)
> The MBeanDumper only accesses the attributes that are there. It is not
> responsible for creating the MBeans in the first place.
> 
> Tomcat isn't creating this MBean so Tomcat is not responsible for incorrectly
> exposing pooledConnection as an attribute with a getter rather than an
> operation. You can tell this by looking at the MBean name. Tomcat uses a
> distinctive naming convention for MBeans [1] and the name used below does not
> match it.
> 
> [1]
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java?view=annotate
> (line 743 onwards)

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52853] @HandlesTypes not resolving classes when added as repository directory

https://issues.apache.org/bugzilla/show_bug.cgi?id=52853

--- Comment #6 from Konstantin Kolinko  2012-03-16 
03:08:06 UTC ---
(In reply to comment #5)
> I will try to provide an example that runs an embedded container.

That would be a question for the users@ list, but I'll answer shortly. See
1) http://tomcat.apache.org/svn.html
2) RUNNING.txt
3) TomcatBaseTest class

You may also want to look at bug #52669 and r1244718 that fixed it. It might be
that something is still missing there.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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

DO NOT REPLY [Bug 52853] @HandlesTypes not resolving classes when added as repository directory