svn commit: r1223057 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ExtendedAccessLogValve.java webapps/docs/changelog.xml webapps/docs/config/valve.xml
Author: kkolinko Date: Sun Dec 25 10:00:13 2011 New Revision: 1223057 URL: http://svn.apache.org/viewvc?rev=1223057&view=rev Log: Merged revision 1222690 from tomcat/trunk: Avoid deprecated code and provide consistent output regardless of platform Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 25 10:00:13 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,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,1187 753,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,1 202035,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,1222850,1222852,1222855 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1
svn commit: r1224607 - /tomcat/trunk/webapps/docs/manager-howto.xml
Author: kkolinko Date: Sun Dec 25 13:24:41 2011 New Revision: 1224607 URL: http://svn.apache.org/viewvc?rev=1224607&view=rev Log: Improve manager-howto.xml: Document the list of roles that allow access to Manager webapp. The manager-script role is just one of them. Modified: tomcat/trunk/webapps/docs/manager-howto.xml Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1224607&r1=1224606&r2=1224607&view=diff == --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Sun Dec 25 13:24:41 2011 @@ -111,22 +111,62 @@ With Ant for more information. anyone on the Internet to execute the Manager application on your server. Therefore, the Manager application is shipped with the requirement that anyone who attempts to use it must authenticate themselves, using a username and -password that have the role manager-script associated with -them. Further, there is no username in the default users file -($CATALINA_BASE/conf/tomcat-users.xml) that is assigned this -role. Therefore, access to the Manager application is completely disabled +password that have one of manager-** roles associated with +them (the role name depends on what functionality is required). +Further, there is no username in the default users file +($CATALINA_BASE/conf/tomcat-users.xml) that is assigned to those +roles. Therefore, access to the Manager application is completely disabled by default. +You can find the role names in the web.xml file of the Manager +web application. The available roles are: + + + manager-gui — Access to the HTML interface. + manager-status — Access to the "Server Status" +page in the HTML interface only. + manager-script — Access to the tools-friendly +plain text interface, that is described in this document. + manager-jmx — Access to JMX proxy interface. + + +The HTML interface is protected against CSRF (Cross-Site Request Forgery) +attacks, but the text and JMX interfaces cannot be protected. To maintain +the CSRF protection: + + + Users with the manager-gui role should not be granted + the manager-script or manager-jmx + roles. + If you use web browser to access the Manager application using + a user that has either manager-script or + manager-jmx roles (for example for testing + the plain text or JMX interfaces), + then all windows of the browser MUST be closed afterwards to terminate + the session. + + +Note that JMX proxy interface is effectively low-level root-like +administrative interface of Tomcat. One can do a lot, if he knows +what commands to call. You should be cautious when enabling the +manager-jmx role. + To enable access to the Manager web application, you must either create -a new username/password combination and associate the role name -manager-script with it, or add the -manager-script role -to some existing username/password combination. Exactly where this is done -depends on which Realm implementation you are using: +a new username/password combination and associate one of the +manager-** roles with it, or add a +manager-** role +to some existing username/password combination. +As the majority of this document describes the commands of plain textual +interface, let the role name for further example to be +manager-script. +Exactly how the usernames/passwords are configured depends on which +Realm implementation you are using: -MemoryRealm - If you have not customized your -$CATALINA_BASE/conf/server.xml to select a different one, -Tomcat defaults to an XML-format file stored at +MemoryRealm — This one is configured in the default +$CATALINA_BASE/conf/server.xml. +If you have not configured it differently, or replaced it with +a different Realm implementation, this realm +reads an XML-format file stored at $CATALINA_BASE/conf/tomcat-users.xml, which can be edited with any text editor. This file contains an XMLfor each individual user, which might @@ -139,12 +179,12 @@ depends on which Realm impl add the manager-script role to the comma-delimited roles attribute for one or more existing users, and/or create new users with that assigned role. -JDBCRealm - Your user and role information is stored in +JDBCRealm — Your user and role information is stored in a database accessed via JDBC. Add the manager-script role to one or more existing users, and/or create one or more new users with this role assigned, following the standard procedures for your environment. -JNDIRealm - Your user and role information is stored in +JNDIRealm — Your user and role information is stored in a directory server accessed via LDAP. Add the manager-script role to one or more existing users, and/or create one or more new users with this role assigned, following
svn commit: r1224608 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/manager-howto.xml
Author: kkolinko Date: Sun Dec 25 13:33:20 2011 New Revision: 1224608 URL: http://svn.apache.org/viewvc?rev=1224608&view=rev Log: Merged revision 1224607 from tomcat/trunk: Improve manager-howto.xml: Document the list of roles that allow access to Manager webapp. The manager-script role is just one of them. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 25 13:33:20 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,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,1187 753,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,1 202035,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 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,11722
svn commit: r1224617 - /tomcat/trunk/webapps/docs/manager-howto.xml
Author: kkolinko Date: Sun Dec 25 17:42:54 2011 New Revision: 1224617 URL: http://svn.apache.org/viewvc?rev=1224617&view=rev Log: Correct description of roles Modified: tomcat/trunk/webapps/docs/manager-howto.xml Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1224617&r1=1224616&r2=1224617&view=diff == --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Sun Dec 25 17:42:54 2011 @@ -124,10 +124,12 @@ web application. The available roles are manager-gui — Access to the HTML interface. manager-status — Access to the "Server Status" -page in the HTML interface only. +page only. manager-script — Access to the tools-friendly -plain text interface, that is described in this document. - manager-jmx — Access to JMX proxy interface. +plain text interface that is described in this document, +and to the "Server Status" page. + manager-jmx — Access to JMX proxy interface +and to the "Server Status" page. The HTML interface is protected against CSRF (Cross-Site Request Forgery) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224618 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/manager-howto.xml
Author: kkolinko Date: Sun Dec 25 17:47:14 2011 New Revision: 1224618 URL: http://svn.apache.org/viewvc?rev=1224618&view=rev Log: Merged revision 1224617 from tomcat/trunk: Correct description of roles Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 25 17:47:14 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,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,1187 753,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,1 202035,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 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
svn commit: r1224622 - /tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml
Author: kkolinko Date: Sun Dec 25 18:33:47 2011 New Revision: 1224622 URL: http://svn.apache.org/viewvc?rev=1224622&view=rev Log: Correct a typo Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=1224622&r1=1224621&r2=1224622&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Sun Dec 25 18:33:47 2011 @@ -119,7 +119,7 @@ appropriate role. Therefore, access to disabled by default. To enable access to the Manager web application, you must either create -a new username/password combination and associate on of the manager roles with +a new username/password combination and associate one of the manager roles with it, or add a manager role to some existing username/password combination. There are four roles defined by the manager application: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224628 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/tomcat/jni/ webapps/docs/ webapps/docs/config/
Author: kkolinko
Date: Sun Dec 25 18:52:37 2011
New Revision: 1224628
URL: http://svn.apache.org/viewvc?rev=1224628&view=rev
Log:
- Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50570
Enable FIPS mode to be set in AprLifecycleListener.
Based upon a patch from Chris Beckey.
- Backport AprLifecycleListener improvements from TC7
This includes:
1. Use consistent external synchronization object for private
initialization methods. Turn initialization flags to false after APR
has been terminated. That is, to terminate it only once.
(rev. 946671 + several after it)
2. Use ExceptionUtils.handleThrowable() for fatal errors (rev. 1001904)
3. Do not allow to change SSL options if SSL engine has already been
initialised. (rev. 1199985 + several after it)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1224628&r1=1224627&r2=1224628&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Dec 25 18:52:37 2011
@@ -50,36 +50,6 @@ PATCHES PROPOSED TO BACKPORT:
- getStuckThreadIds() returns a list of ids. It might be useful to
have a similar method that returns Thread.getName() names.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50570
- Apply FIPS mode patch from TC7:
- http://svn.apache.org/viewvc?rev=1199985&view=rev
- http://svn.apache.org/viewvc?rev=124&view=rev
- http://svn.apache.org/viewvc?rev=1200448&view=rev
- +1: schultz, jfclere
- -1: kkolinko: It needs to include more preceding and followup
- changes. Updated patch proposed below.
-
-* Backport AprLifecycleListener improvements from TC7
- This includes:
- - Use consistent external synchronization object for private
- initialization methods. Turn initialization flags to false after APR
- has been terminated. That is, to terminate it only once.
- (rev. 946671 + several after it)
- - Use ExceptionUtils.handleThrowable() for fatal errors
- (rev. 1001904)
- - Do not allow to change SSL options if SSL engine has already been
- initialised.
- (rev. 1199985 + several after it)
- - Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50570
- Enable FIPS mode to be set in AprLifecycleListener.
- Based upon a patch from Chris Beckey.
- (rev. 1199985 + several after it)
- kkolinko: I tested only that it does not break things with the current
-released tcnative version 1.1.22 that does not have FIPS mode support.
-
http://people.apache.org/~kkolinko/patches/2011-11-12_tc6_AprLifecycleListener.patch
- +1: kkolinko, markt,funkman
- -1:
-
* Fix autodeployment of applications that have configuration errors.
If autodeployment fails, create DeployedApplication object and register
what we deployed (xml or war or dir - a single file) as redeployResource.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1224628&r1=1224627&r2=1224628&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Sun Dec 25 18:52:37 2011
@@ -28,6 +28,8 @@ import org.apache.catalina.util.StringMa
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jni.Library;
+import org.apache.tomcat.jni.SSL;
+import org.apache.tomcat.util.ExceptionUtils;
@@ -65,15 +67,23 @@ public class AprLifecycleListener
// -- Properties
protected static String SSLEngine = "on"; //default on
+protected static String FIPSMode = "off"; // default off, valid only when
SSLEngine="on"
protected static String SSLRandomSeed = "builtin";
protected static boolean sslInitialized = false;
protected static boolean aprInitialized = false;
protected static boolean sslAvailable = false;
protected static boolean aprAvailable = false;
+protected static boolean fipsModeActive = false;
+
+protected static final Object lock = new Object();
public static boolean isAprAvailable() {
//https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
-if (instanceCreated) init();
+if (instanceCreated) {
+synchronized (lock) {
+
DO NOT REPLY [Bug 50570] Allow explicit use of FIPS mode in APR lifecycle listener
https://issues.apache.org/bugzilla/show_bug.cgi?id=50570 --- Comment #24 from Konstantin Kolinko 2011-12-25 19:23:18 UTC --- Fixed in 6.0 by r1224628 and will be in 6.0.36. -- 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: r1224640 - in /tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http: LocalStrings.properties Parameters.java
Author: kkolinko
Date: Sun Dec 25 20:02:14 2011
New Revision: 1224640
URL: http://svn.apache.org/viewvc?rev=1224640&view=rev
Log:
CTR
Correct typo in message name - followup to r1221282
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/Parameters.java
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1224640&r1=1224639&r2=1224640&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/LocalStrings.properties
(original)
+++
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/LocalStrings.properties
Sun Dec 25 20:02:14 2011
@@ -14,7 +14,7 @@
# limitations under the License.
parameters.bytes=Start processing with input [{0}]
-paramerers.copyFail=Failed to create copy of original parameter values for
debug logging purposes
+parameters.copyFail=Failed to create copy of original parameter values for
debug logging purposes
parameters.decodeFail.debug=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored.
parameters.decodeFail.info=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored. Note that the name and value quoted here may be
corrupted due to the failed decoding. Use debug level logging to see the
original, non-corrupted values.
parameters.invalidChunk=Invalid chunk starting at byte [{0}] and ending at
byte [{1}] with a value of [{2}] ignored
Modified:
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/Parameters.java?rev=1224640&r1=1224639&r2=1224640&view=diff
==
---
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/Parameters.java
(original)
+++
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/http/Parameters.java
Sun Dec 25 20:02:14 2011
@@ -353,7 +353,7 @@ public final class Parameters {
origValue.append(bytes, valueStart, valueEnd - valueStart);
} catch (IOException ioe) {
// Should never happen...
-log.error(sm.getString("paramerers.copyFail"), ioe);
+log.error(sm.getString("parameters.copyFail"), ioe);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224648 - in /tomcat/trunk: java/org/apache/juli/logging/UserDataHelper.java java/org/apache/tomcat/util/http/Cookies.java java/org/apache/tomcat/util/http/LocalStrings.properties webapps
Author: kkolinko
Date: Sun Dec 25 21:50:06 2011
New Revision: 1224648
URL: http://svn.apache.org/viewvc?rev=1224648&view=rev
Log:
- UserDataHelper:
1) Fix bug in suppressionTime processing. The config value is in seconds, but
time arithmetic needs msecs. Now multiplying the configured value by 1000L.
2) Change the API to allow to distinguish the case when next message will be
printed at DEBUG level.
3) The private method logAtInfo() now always updates the time. Thus I removed
its argument.
- Cookies:
1) Add i18n and print special message when we fall from INFO to DEBUG logging.
Modified:
tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java
tomcat/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java?rev=1224648&r1=1224647&r2=1224648&view=diff
==
--- tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java Sun Dec 25
21:50:06 2011
@@ -42,6 +42,7 @@ public class UserDataHelper {
// A value of 0 is equivalent to using INFO_ALL
// A negative value will trigger infinite suppression
+// The value is milliseconds
private long suppressionTime;
private volatile long lastInfoTime = 0;
@@ -64,9 +65,9 @@ public class UserDataHelper {
}
// Default suppression time of 1 day.
-suppressionTime = Long.getLong(
+suppressionTime = Integer.parseInt(
"org.apache.juli.logging.UserDataHelper.SUPPRESSION_TIME",
-60 * 60 * 24).longValue();
+60 * 60 * 24) * 1000L;
if (suppressionTime == 0) {
config = Config.INFO_ALL;
@@ -74,55 +75,61 @@ public class UserDataHelper {
}
-public boolean isEnabled() {
+/**
+ * Returns log mode for the next log message, or null if the
+ * message should not be logged.
+ *
+ *
+ * If INFO_THEN_DEBUG configuration option is enabled, this
+ * method might change internal state of this object.
+ *
+ * @return Log mode, or null
+ */
+public Mode getNextMode() {
if (Config.NONE == config) {
-return false;
+return null;
} else if (Config.DEBUG_ALL == config) {
-return log.isDebugEnabled();
+return log.isDebugEnabled() ? Mode.DEBUG : null;
} else if (Config.INFO_THEN_DEBUG == config) {
-if (logAtInfo(false)) {
-return log.isInfoEnabled();
+if (logAtInfo()) {
+return log.isInfoEnabled() ? Mode.INFO_THEN_DEBUG : null;
} else {
-return log.isDebugEnabled();
+return log.isDebugEnabled() ? Mode.DEBUG : null;
}
} else if (Config.INFO_ALL == config) {
-return log.isInfoEnabled();
+return log.isInfoEnabled() ? Mode.INFO : null;
}
// Should never happen
-return false;
+return null;
}
-public void log(String message) {
-if (Config.NONE == config) {
-// NOOP;
-} else if (Config.DEBUG_ALL == config) {
-log.debug(message);
-} else if (Config.INFO_THEN_DEBUG == config) {
-if (logAtInfo(true)) {
+public void log(Mode mode, String message) {
+if (mode != null) {
+switch (mode) {
+case INFO:
+case INFO_THEN_DEBUG:
log.info(message);
-} else {
+break;
+case DEBUG:
log.debug(message);
+break;
}
-} else if (Config.INFO_ALL == config) {
-log.info(message);
}
}
-public void log(String message, Throwable t) {
-if (Config.NONE == config) {
-// NOOP;
-} else if (Config.DEBUG_ALL == config) {
-log.debug(message, t);
-} else if (Config.INFO_THEN_DEBUG == config) {
-if (logAtInfo(true)) {
+public void log(Mode mode, String message, Throwable t) {
+if (mode != null) {
+switch (mode) {
+case INFO:
+case INFO_THEN_DEBUG:
log.info(message, t);
-} else {
+break;
+case DEBUG:
log.debug(message, t);
+break;
}
-} else if (Config.INFO_ALL == config) {
-log.info(message, t);
}
}
@@ -132,7 +139,7 @@ public class UserDataHelper {
* see a simple enough way to make it completely thread-safe that was not
* likely to compromise pe
svn commit: r1224650 - /tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java
Author: kkolinko
Date: Sun Dec 25 22:06:23 2011
New Revision: 1224650
URL: http://svn.apache.org/viewvc?rev=1224650&view=rev
Log:
Followup to r1224648
Fix my bug in property retrieval.
Modified:
tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java
Modified: tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java?rev=1224650&r1=1224649&r2=1224650&view=diff
==
--- tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/UserDataHelper.java Sun Dec 25
22:06:23 2011
@@ -65,9 +65,9 @@ public class UserDataHelper {
}
// Default suppression time of 1 day.
-suppressionTime = Integer.parseInt(
+suppressionTime = Integer.getInteger(
"org.apache.juli.logging.UserDataHelper.SUPPRESSION_TIME",
-60 * 60 * 24) * 1000L;
+60 * 60 * 24).intValue() * 1000L;
if (suppressionTime == 0) {
config = Config.INFO_ALL;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224652 - /tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
Author: kkolinko Date: Sun Dec 25 22:43:20 2011 New Revision: 1224652 URL: http://svn.apache.org/viewvc?rev=1224652&view=rev Log: Correct message what US dictionary flags as a typo (but UK one does not) Modified: tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties Modified: tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1224652&r1=1224651&r2=1224652&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties Sun Dec 25 22:43:20 2011 @@ -24,4 +24,4 @@ parameters.noequal=Parameter starting at cookies.invalidCookieToken=Cookies: Invalid cookie. Value not a token or quoted value cookies.invalidSpecial=Cookies: Unknown Special Cookie -cookies.fallToDebug=\n Note: further occurences of Cookie errors will be logged at DEBUG level. +cookies.fallToDebug=\n Note: further occurrences of Cookie errors will be logged at DEBUG level. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224654 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/juli/logging/ java/org/apache/tomcat/util/http/ webapps/docs/ webapps/docs/config/
Author: kkolinko Date: Sun Dec 25 22:51:56 2011 New Revision: 1224654 URL: http://svn.apache.org/viewvc?rev=1224654&view=rev Log: Merged revisions r1224648 r1224650 r1224652 from tomcat/trunk: Improve fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52184 - UserDataHelper: 1) Fix bug in suppressionTime processing. The config value is in seconds, but time arithmetic needs msecs. Now multiplying the configured value by 1000L. 2) Change the API to allow to distinguish the case when next message will be printed at DEBUG level. 3) The private method logAtInfo() now always updates the time. Thus I removed its argument. - Cookies: 1) Add i18n and print special message when we fall from INFO to DEBUG logging. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/juli/logging/UserDataHelper.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 25 22:51:56 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,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,1187 753,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,1 202035,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 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1
svn commit: r1224657 - in /tomcat/trunk/java/org/apache/tomcat/util/http: LocalStrings.properties Parameters.java
Author: kkolinko
Date: Sun Dec 25 23:25:51 2011
New Revision: 1224657
URL: http://svn.apache.org/viewvc?rev=1224657&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52384
Do not fail in Parameter parsing when debug logging is enabled.
Also do no flag extra '&' as errors.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1224657&r1=1224656&r2=1224657&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties Sun
Dec 25 23:25:51 2011
@@ -17,6 +17,7 @@ parameters.bytes=Start processing with i
parameters.copyFail=Failed to create copy of original parameter values for
debug logging purposes
parameters.decodeFail.debug=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored.
parameters.decodeFail.info=Character decoding failed. Parameter [{0}] with
value [{1}] has been ignored. Note that the name and value quoted here may be
corrupted due to the failed decoding. Use debug level logging to see the
original, non-corrupted values.
+parameters.emptyChunk=Empty parameter chunk ignored
parameters.invalidChunk=Invalid chunk starting at byte [{0}] and ending at
byte [{1}] with a value of [{2}] ignored
parameters.maxCountFail=More than the maximum number of request parameters
(GET plus POST) for a single request ([{0}]) were detected. Any parameters
beyond this limit have been ignored. To change this limit, set the
maxParameterCount attribute on the Connector.
parameters.multipleDecodingFail=Character decoding failed. A total of [{0}]
failures were detected but only the first was logged. Enable debug level
logging for this logger to log all failures.
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1224657&r1=1224656&r2=1224657&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Sun Dec 25
23:25:51 2011
@@ -297,6 +297,15 @@ public final class Parameters {
}
if (nameEnd <= nameStart ) {
+if (valueStart == -1) {
+// &&
+if (log.isDebugEnabled()) {
+log.debug(sm.getString("parameters.emptyChunk"));
+}
+// Do not flag as error
+continue;
+}
+// &=foo&
if (log.isInfoEnabled()) {
if (valueEnd >= nameStart && log.isDebugEnabled()) {
String extract = new String(bytes, nameStart,
@@ -318,7 +327,11 @@ public final class Parameters {
}
tmpName.setBytes(bytes, nameStart, nameEnd - nameStart);
-tmpValue.setBytes(bytes, valueStart, valueEnd - valueStart);
+if (valueStart >= 0) {
+tmpValue.setBytes(bytes, valueStart, valueEnd - valueStart);
+} else {
+tmpValue.setBytes(bytes, 0, 0);
+}
// Take copies as if anything goes wrong originals will be
// corrupted. This means original values can be logged.
@@ -326,7 +339,11 @@ public final class Parameters {
if (log.isDebugEnabled()) {
try {
origName.append(bytes, nameStart, nameEnd - nameStart);
-origValue.append(bytes, valueStart, valueEnd - valueStart);
+if (valueStart >= 0) {
+origValue.append(bytes, valueStart, valueEnd -
valueStart);
+} else {
+origValue.append(bytes, 0, 0);
+}
} catch (IOException ioe) {
// Should never happen...
log.error(sm.getString("parameters.copyFail"), ioe);
@@ -343,11 +360,15 @@ public final class Parameters {
tmpName.setCharset(charset);
name = tmpName.toString();
-if (decodeValue) {
-urlDecode(tmpValue);
+if (valueStart >= 0) {
+if (decodeValue) {
+urlDecode(tmpValue);
+}
+tmpValue.setCharset(charset);
+value = tmpValue.toString();
+} else {
+value = "";
}
-
svn commit: r1224658 - /tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/pom.xml
Author: olamy Date: Sun Dec 25 23:30:19 2011 New Revision: 1224658 URL: http://svn.apache.org/viewvc?rev=1224658&view=rev Log: jsp-api: add osgi declaration Modified: tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/pom.xml Modified: tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/pom.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/pom.xml?rev=1224658&r1=1224657&r2=1224658&view=diff == --- tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/pom.xml (original) +++ tomcat/sandbox/trunk-mvn-build/tomcat-jsp-api/pom.xml Sun Dec 25 23:30:19 2011 @@ -24,6 +24,8 @@ tomcat-parent 7.0.24-SNAPSHOT + + bundle tomcat-jsp-api JSP package @@ -52,6 +54,29 @@ + + +org.apache.felix +maven-bundle-plugin + + +javax.servlet.jsp +2.2.0 + + javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; version=2.2, + javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp.tagext; version=2.2 + + + javax.servlet; version=3.0,javax.servlet.http; version=3.0, + javax.servlet.resources; version=3.0,javax.el;version=2.2.0 + + + CDC-1.0/Foundation-1.0,J2SE-1.3 + + + + +
svn commit: r1224659 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/LocalStrings.properties java/org/apache/tomcat/util/http/Parameters.java webapps/docs/changelog.xml
Author: kkolinko Date: Sun Dec 25 23:33:16 2011 New Revision: 1224659 URL: http://svn.apache.org/viewvc?rev=1224659&view=rev Log: Merged revision 1224657 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52384 Do not fail in Parameter parsing when debug logging is enabled. Also do not flag extra '&' as errors. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 25 23:33:16 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,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,1187 753,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,1 202035,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 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1
svn commit: r1224660 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Dec 25 23:37:54 2011 New Revision: 1224660 URL: http://svn.apache.org/viewvc?rev=1224660&view=rev Log: proposals Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1224660&r1=1224659&r2=1224660&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Dec 25 23:37:54 2011 @@ -40,3 +40,10 @@ PATCHES PROPOSED TO BACKPORT: svn propset svn:eol-style native container/catalina/src/share/org/apache/catalina/filters/SetCharacterEncodingFilter.java +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52384 + Do not fail in Parameter parsing when debug logging is enabled. + Also do not flag extra '&' as errors. + http://svn.apache.org/viewvc?rev=1224659&view=rev + +1: kkolinko + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1224660&r1=1224659&r2=1224660&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Dec 25 23:37:54 2011 @@ -115,6 +115,13 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52384 + Do not fail in Parameter parsing when debug logging is enabled. + Also do not flag extra '&' as errors. + http://svn.apache.org/viewvc?rev=1224659&view=rev + +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 52384] URL parameter without value should be parsed successfully when logging level = DEBUG
https://issues.apache.org/bugzilla/show_bug.cgi?id=52384 Konstantin Kolinko changed: What|Removed |Added Component|Catalina|Catalina Version|7.0.23 |6.0.35 Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #1 from Konstantin Kolinko 2011-12-25 23:40:17 UTC --- Fixed in 7.0 and will be in 7.0.24. The issue also affects 6.0.35 and not yet released code in 5.5.x branch. Proposed for 6.0 and 5.5. -- 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: r1224662 - in /tomcat/trunk: java/org/apache/tomcat/util/http/LocalStrings.properties java/org/apache/tomcat/util/http/Parameters.java webapps/docs/config/systemprops.xml
Author: kkolinko
Date: Mon Dec 26 00:01:03 2011
New Revision: 1224662
URL: http://svn.apache.org/viewvc?rev=1224662&view=rev
Log:
Apply UserDataHelper to o.a.t.util.http.Parameters
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1224662&r1=1224661&r2=1224662&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties Mon
Dec 26 00:01:03 2011
@@ -22,6 +22,7 @@ parameters.invalidChunk=Invalid chunk st
parameters.maxCountFail=More than the maximum number of request parameters
(GET plus POST) for a single request ([{0}]) were detected. Any parameters
beyond this limit have been ignored. To change this limit, set the
maxParameterCount attribute on the Connector.
parameters.multipleDecodingFail=Character decoding failed. A total of [{0}]
failures were detected but only the first was logged. Enable debug level
logging for this logger to log all failures.
parameters.noequal=Parameter starting at position [{0}] and ending at position
[{1}] with a value of [{0}] was not followed by an '=' character
+parameters.fallToDebug=\n Note: further occurrences of Parameter errors will
be logged at DEBUG level.
cookies.invalidCookieToken=Cookies: Invalid cookie. Value not a token or
quoted value
cookies.invalidSpecial=Cookies: Unknown Special Cookie
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1224662&r1=1224661&r2=1224662&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Mon Dec 26
00:01:03 2011
@@ -25,6 +25,7 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
+import org.apache.juli.logging.UserDataHelper;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
@@ -41,6 +42,8 @@ public final class Parameters {
private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(Parameters.class );
+private static final UserDataHelper userDataLog = new UserDataHelper(log);
+
protected static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.http");
@@ -306,20 +309,22 @@ public final class Parameters {
continue;
}
// &=foo&
-if (log.isInfoEnabled()) {
-if (valueEnd >= nameStart && log.isDebugEnabled()) {
-String extract = new String(bytes, nameStart,
-valueEnd - nameStart, DEFAULT_CHARSET);
-log.info(sm.getString("parameters.invalidChunk",
-Integer.valueOf(nameStart),
-Integer.valueOf(valueEnd),
-extract));
+UserDataHelper.Mode logMode = userDataLog.getNextMode();
+if (logMode != null) {
+String extract;
+if (valueEnd >= nameStart) {
+extract = new String(bytes, nameStart, valueEnd
+- nameStart, DEFAULT_CHARSET);
} else {
-log.info(sm.getString("parameters.invalidChunk",
-Integer.valueOf(nameStart),
-Integer.valueOf(nameEnd),
-null));
+extract = "";
+}
+String message = sm.getString("parameters.invalidChunk",
+Integer.valueOf(nameStart),
+Integer.valueOf(valueEnd), extract);
+if (logMode.fallToDebug()) {
+message += sm.getString("parameters.fallToDebug");
}
+userDataLog.log(logMode, message);
}
parseFailed = true;
continue;
@@ -387,8 +392,17 @@ public final class Parameters {
log.debug(sm.getString("parameters.decodeFail.debug",
origName.toString(), origValue.toString()), e);
} else if (log.isInfoEnabled()) {
-
svn commit: r1224663 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko
Date: Mon Dec 26 00:04:39 2011
New Revision: 1224663
URL: http://svn.apache.org/viewvc?rev=1224663&view=rev
Log:
Reduce log level for message for hitting parameter count limit from warn to
info.
I am not sure that UserDataHelper needs to be applied here.
Maybe use a separate UserDataHelper instance?
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1224663&r1=1224662&r2=1224663&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Mon Dec 26
00:04:39 2011
@@ -381,7 +381,7 @@ public final class Parameters {
// Hitting limit stops processing further params but does
// not cause request to fail.
parseFailed = true;
-log.warn(ise.getMessage());
+log.info(ise.getMessage());
break;
}
} catch (IOException e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224664 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/LocalStrings.properties java/org/apache/tomcat/util/http/Parameters.java webapps/docs/config/systemprops.xml
Author: kkolinko Date: Mon Dec 26 00:08:35 2011 New Revision: 1224664 URL: http://svn.apache.org/viewvc?rev=1224664&view=rev Log: Merged revision 1224662 from tomcat/trunk: Further fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52184 Apply UserDataHelper to o.a.t.util.http.Parameters Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 26 00:08:35 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,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,1187 753,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,1 202035,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 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746
svn commit: r1224665 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/Parameters.java webapps/docs/changelog.xml
Author: kkolinko Date: Mon Dec 26 00:14:46 2011 New Revision: 1224665 URL: http://svn.apache.org/viewvc?rev=1224665&view=rev Log: Merged revision 1224663 from tomcat/trunk: Reduce log level for message for hitting parameter count limit from warn to info. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 26 00:14:46 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,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,1187 753,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,1 202035,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 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167
svn commit: r1224666 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko
Date: Mon Dec 26 00:24:30 2011
New Revision: 1224666
URL: http://svn.apache.org/viewvc?rev=1224666&view=rev
Log:
proposal
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1224666&r1=1224665&r2=1224666&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Dec 26 00:24:30 2011
@@ -47,3 +47,12 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?rev=1224659&view=rev
+1: kkolinko
-1:
+
+* Reduce log level for the message about hitting maxParameterCount limit
+ from WARN to INFO.
+ in /connectors/util/java/org/apache/tomcat/util/http/Parameters.java line
243:
+ - log.warn(sm.getString("parameters.maxCountFail",
+ + log.info(sm.getString("parameters.maxCountFail",
+ (backport of http://svn.apache.org/viewvc?rev=1224665&view=rev)
+ +1: kkolinko
+ -1:
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1224666&r1=1224665&r2=1224666&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 26 00:24:30 2011
@@ -122,6 +122,15 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko
-1:
+* Reduce log level for the message about hitting maxParameterCount limit
+ from WARN to INFO.
+ in /java/org/apache/tomcat/util/http/Parameters.java line 242:
+ - log.warn(sm.getString("parameters.maxCountFail",
+ + log.info(sm.getString("parameters.maxCountFail",
+ (backport of http://svn.apache.org/viewvc?rev=1224665&view=rev)
+ +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
Re: Time for 5.5.35?
2011/12/21 Mark Thomas : > On 20/12/2011 10:03, Jim Jagielski wrote: >> >> On Dec 20, 2011, at 2:42 AM, jean-frederic clere wrote: >> >>> On 12/19/2011 10:49 PM, Mark Thomas wrote: All, I know the 5.5.x change log is short but [1] is one of those annoying (for me any way) bugs it would be nice to get in a fixed release. Jim: Any chance of a 5.5.x tag later this week? I won't suggest this coming weekend ;) >>> >>> +1 for middle of next week. >>> >> >> Fine w/ me... > > The status file is clear. > > Bugzilla is clear (!) > > I think we are good to go. I'd suggest waiting ~24 hours for folks to > spot anything else that needs doing and aim for a tag on Thursday. > 1. There was a bug report about exception when DEBUG logging is enabled. https://issues.apache.org/bugzilla/show_bug.cgi?id=52384 Already fixed in 7.0 and backports proposed. 2. I reduced one warning to info (per BZ 52184 concerns) - also proposed. Neither issue is a showstopper, but should be easy to fix. X. It might be interesting to backport UserDataHandler (BZ 52184) from TC7 to earlier versions, but I am not sure how much interest is there in that. It is not a showstopper, because one can configure its logging to take care of BZ 52184. Should be easy for 6.0. Will be more work for 5.5 (replace enums with int constants?). For reference, the revisions that implement this feature are: http://svn.apache.org/viewvc?view=revision&revision=1212102 (initial, Cookies) http://svn.apache.org/viewvc?view=revision&revision=1212110 (changelog) http://svn.apache.org/viewvc?view=revision&revision=1213470 (JULI build fix) http://svn.apache.org/viewvc?view=revision&revision=1220297 (catalina.policy) http://svn.apache.org/viewvc?view=revision&revision=1224654 (API review) http://svn.apache.org/viewvc?view=revision&revision=1224664 (Parameters) I expect to be rather busy next week. Best regards, Konstantin Kolinko - 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/2595 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1224648 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
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/2596 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1224663 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 18 mins 19 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-26122011.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-26122011-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-26122011-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-26122011.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/worksp ace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-26122011.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-tr unk/tomcat-deps/tomcat-dbcp-26122011.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-26122011.jar:/srv/gump/public/workspace/junit/dist/j
svn commit: r1224682 - in /tomcat/trunk: build.properties.default build.xml
Author: kkolinko
Date: Mon Dec 26 06:49:35 2011
New Revision: 1224682
URL: http://svn.apache.org/viewvc?rev=1224682&view=rev
Log:
Update to commons-pool 1.5.7.
Fix build condition for tomcat-dbcp to always rebuild when a new version of
pool or dbcp is downloaded.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1224682&r1=1224681&r2=1224682&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Dec 26 06:49:35 2011
@@ -147,7 +147,7 @@ commons-dbcp-src.loc.1=${base-commons.lo
commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
# - Commons Pool, version 1.1 or later -
-commons-pool.version=1.5.6
+commons-pool.version=1.5.7
commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1224682&r1=1224681&r2=1224682&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Dec 26 06:49:35 2011
@@ -2235,10 +2235,14 @@ 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: r1224684 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default build.xml webapps/docs/changelog.xml
Author: kkolinko Date: Mon Dec 26 06:56:41 2011 New Revision: 1224684 URL: http://svn.apache.org/viewvc?rev=1224684&view=rev Log: Merged revision 1224682 from tomcat/trunk: Update to commons-pool 1.5.7. Fix build condition for tomcat-dbcp to always rebuild when a new version of pool or dbcp is downloaded. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/build.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 26 06:56:41 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,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,1187 753,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,1 202035,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 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-11661
svn commit: r1224686 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon Dec 26 07:12:36 2011 New Revision: 1224686 URL: http://svn.apache.org/viewvc?rev=1224686&view=rev Log: Correct commons components names, for consistency. 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=1224686&r1=1224685&r2=1224686&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Dec 26 07:12:36 2011 @@ -167,7 +167,7 @@ -Update commons pool to 1.5.7. (kkolinko) +Update Apache Commons Pool to 1.5.7. (kkolinko) Fix line ends in .gitignore files contained in source @@ -1299,7 +1299,7 @@ -Update to Commons Daemon 1.0.6. (markt) +Update to Apache Commons Daemon 1.0.6. (markt) Update to Eclipse JDT Compiler 3.7. (markt) @@ -2112,7 +2112,7 @@ not found it might be because execute permission is needed. (kkolinko) -Update commons pool to 1.5.6. (markt) +Update Apache Commons Pool to 1.5.6. (markt) 51135: Fix auto-detection of JAVA_HOME for 64-bit Windows @@ -2896,7 +2896,7 @@ -Update to Commons Daemon 1.0.5. (mturk) +Update to Apache Commons Daemon 1.0.5. (mturk) @@ -3197,7 +3197,7 @@ -Update to Commons Daemon 1.0.4. (mturk) +Update to Apache Commons Daemon 1.0.4. (mturk) @@ -4032,7 +4032,7 @@ Patch provided by sebb. (markt) -Update commons pool to 1.5.5. (markt) +Update Apache Commons Pool to 1.5.5. (markt) 49955: Improvement and correction of Building Tomcat guide. @@ -4073,7 +4073,7 @@ files. (markt) -Update Commons Daemon from 1.0.2 to 1.0.3.(markt) +Update Apache Commons Daemon from 1.0.2 to 1.0.3. (markt) Update Eclipse JDT Core Batch Compiler (ecj.jar) from 3.5.1 to 3.6. - 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/2597 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1224682 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1224688 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default webapps/docs/changelog.xml
Author: kkolinko
Date: Mon Dec 26 07:19:20 2011
New Revision: 1224688
URL: http://svn.apache.org/viewvc?rev=1224688&view=rev
Log:
Update to Apache Commons Daemon 1.0.8
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
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=1224688&r1=1224687&r2=1224688&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 26 07:19:20 2011
@@ -87,11 +87,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko,funkman
-1:
-* Update Commons Daemon to 1.0.8
- Change is trivial so no patch provided
- +1: mturk, markt,funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335
Only handle <\% and not \% as escaped in template text.
http://svn.apache.org/viewvc?rev=1215121&view=rev
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1224688&r1=1224687&r2=1224688&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Dec 26 07:19:20 2011
@@ -149,7 +149,7 @@ nsis.nsisdl.dll=${nsis.home}/Plugins/NSI
nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
# - Commons Daemon, version 1.0-Alpha or later -
-commons-daemon.version=1.0.7
+commons-daemon.version=1.0.8
commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
commons-daemon.native.win.home=${commons-daemon.home}/windows
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=1224688&r1=1224687&r2=1224688&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Dec 26 07:19:20 2011
@@ -44,6 +44,13 @@
General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
-->
+
+
+
+Update Apache Commons Daemon to 1.0.8. (mturk)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1224690 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Dec 26 07:49:12 2011 New Revision: 1224690 URL: http://svn.apache.org/viewvc?rev=1224690&view=rev Log: Propose update of commons-pool 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=1224690&r1=1224689&r2=1224690&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 26 07:49:12 2011 @@ -126,6 +126,18 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Update to Apache Commons Pool 1.5.7 + In build.properties.default line 138: + - commons-pool.version=1.5.6 + + commons-pool.version=1.5.7 + Changelog: http://commons.apache.org/pool/changes-report.html + Reminder: One has to explicitly select "download" target in build.xml to + pick up the changes, as in the usual "deploy" target there is no check + that tomcat-dbcp.jar that has been built earlier used the specified + versions of pool and dbcp. + +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
