svn commit: r1200218 - in /tomcat/tc7.0.x/trunk: ./ conf/ java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/filters/ java/org/apache/tomcat/util/http/ webapps/docs
Author: kkolinko Date: Thu Nov 10 08:44:03 2011 New Revision: 1200218 URL: http://svn.apache.org/viewvc?rev=1200218&view=rev Log: Merged revisions r1198696 r1198707 r1200056 r1200107 from tomcat/trunk: - Introduce new request attribute to be used to mark request if there was a failure during parameter parsing, - Implement FailedRequestFilter - a filter that triggers parameter parsing and rejects requests marked with that attribute. - Add sample configuration for FailedRequestFilter to conf/web.xml. Added: tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java - copied, changed from r1198696, tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/conf/web.xml tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 08:44:03 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,1199418,1199432,1199436,1199513,1199529,1199980,116,1200106 +/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,11
svn commit: r1200224 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/Request.java webapps/docs/changelog.xml
Author: kkolinko Date: Thu Nov 10 08:53:39 2011 New Revision: 1200224 URL: http://svn.apache.org/viewvc?rev=1200224&view=rev Log: Merged revision 1200089 from tomcat/trunk: Refactor special attribute names handling, to use hash table lookup + adapter class, instead of series of name.equals() tests. Extracted add/change/remove notification delivery into separate methods. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 08:53:39 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,1200106-1200107 +/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
[Tomcat Wiki] Update of "clarkstuart" by clarkstuart
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "clarkstuart" page has been changed by clarkstuart: http://wiki.apache.org/tomcat/clarkstuart New page: '''Trotz Wirtschaftskrise: Plastikgeld boomt''' Die steigende Beliebtheit der [[http://www.kreditkarte.com | kreditkarte]] spült dem Anbieter American Express jede Menge Geld in die Kasse. Im dritten Quartal verdiente das Unternehmen mit dem berühmten Werbespruch "Bezahlen Sie einfach mit Ihrem guten Namen" unterm Strich 1,2 Milliarden Dollar (873 Mio Euro). Damit stieg der Gewinn im Vergleich zum Vorjahreszeitraum um 13 Prozent. "Die Nutzer haben in diesem Quartal viel mit der Kreditkarte gezahlt", sagte Firmenchef Kenneth Chenault bei der Vorstellung der Bilanzen in New York. Er sprach von einem Rekordniveau. Zudem kam dem US-Finanzkonzern zugute, dass die Nutzer ihre ausstehenden Rechnungen zuverlässiger bezahlen. Für Ausfälle musste American Express noch 249 Millionen Dollar zurücklegen nach 373 Millionen Dollar. Säumige Schuldner hatten sich während der Wirtschaftskrise zu einem Riesenproblem für American Express entwickelt. Anders als die Wettbewerber Visa und Mastercard muss das Unternehmen platzende Rechnungen selbst verkraften. Bei den zwei Rivalen liegt das Risiko bei den Partnern, welche die [[http://www.kreditkarte.com/vergleichen/prepaid/| Prepaid Kreditkarten]] ausgeben und Kredit gewähren. Das sind zumeist Banken, aber auch Fluggesellschaften oder Autoverleiher. Trotz der Geschäftszahlen, die über den Analystenerwartungen lagen, fiel die Aktie nachbörslich leicht. Unter den Anlegern herrscht die Sorge, dass die Zahlungsausfälle mit Fortschreiten der Euro-Schuldenkrise wieder ansteigen könnten und sich die Konsumenten mit Einkäufen wieder mehr zurückhalten. Zuletzt waren die Erträge - die Einnahmen von American Express - aber noch um 9 Prozent auf 7,6 Milliarden Dollar gestiegen. Auch Visa und Mastercard hatten zuletzt über gute Geschäfte berichtet. Der weltgrößte Anbieter Visa steigerte im vierten Geschäftsquartal (Juli bis September) den Gewinn im Vergleich zum Vorjahreszeitraum um 14 Prozent auf 880 Millionen Dollar (633 Mio Euro). Mit diesem Gewinn übertraf Visa die Erwartungen der Analysten. Nachbörslich sank die Aktie dennoch um annähernd 2 Prozent. Visa hatte schon in den vergangenen Quartalen die Erwartungen regelmäßig übertroffen. Der US-Finanzkonzern Mastercard konnte im dritten Quartal seinen Gewinn im Vergleich zum Vorjahreszeitraum um 38 Prozent auf 717 Millionen Dollar (520 Mio Euro) steigern. Alle drei Anbieter bieten auch Gold-Kreditkarten an und stellen ihr Geschäft derzeit auf eine breitere Basis. American Express hat für eine halbe Milliarde Euro das Bonusprogramm Payback übernommen. Bei Payback können Verbraucher in teilnehmenden Geschäften und Onlineshops Punkte für jeden Einkauf sammeln und diese dann in Prämien eintauschen. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200263 - in /tomcat/trunk/webapps/docs: config/ajp.xml config/filter.xml config/http.xml security-howto.xml
Author: kkolinko Date: Thu Nov 10 10:48:27 2011 New Revision: 1200263 URL: http://svn.apache.org/viewvc?rev=1200263&view=rev Log: Add links to FailedRequestFilter in several places and do other small documentation improvements. Modified: tomcat/trunk/webapps/docs/config/ajp.xml tomcat/trunk/webapps/docs/config/filter.xml tomcat/trunk/webapps/docs/config/http.xml tomcat/trunk/webapps/docs/security-howto.xml Modified: tomcat/trunk/webapps/docs/config/ajp.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/ajp.xml?rev=1200263&r1=1200262&r2=1200263&view=diff == --- tomcat/trunk/webapps/docs/config/ajp.xml (original) +++ tomcat/trunk/webapps/docs/config/ajp.xml Thu Nov 10 10:48:27 2011 @@ -99,7 +99,9 @@ The maximum number of parameter and value pairs (GET plus POST) which will be automatically parsed by the container. Parameter and value pairs beyond this limit will be ignored. A value of less than 0 means no limit. - If not specified, a default of 1 is used. + If not specified, a default of 1 is used. Note that + FailedRequestFilter filter can be + used to reject requests that hit the limit. Modified: tomcat/trunk/webapps/docs/config/filter.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1200263&r1=1200262&r2=1200263&view=diff == --- tomcat/trunk/webapps/docs/config/filter.xml (original) +++ tomcat/trunk/webapps/docs/config/filter.xml Thu Nov 10 10:48:27 2011 @@ -1226,6 +1226,8 @@ org.apache.catalina.filters.RequestDumpe filter is not so high, because parameter parsing does check content type of the request before consuming the request body. +The request is rejected with HTTP status code 400 (Bad Request). + Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1200263&r1=1200262&r2=1200263&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Thu Nov 10 10:48:27 2011 @@ -97,7 +97,9 @@ The maximum number of parameter and value pairs (GET plus POST) which will be automatically parsed by the container. Parameter and value pairs beyond this limit will be ignored. A value of less than 0 means no limit. - If not specified, a default of 1 is used. + If not specified, a default of 1 is used. Note that + FailedRequestFilter filter can be + used to reject requests that hit the limit. Modified: tomcat/trunk/webapps/docs/security-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1200263&r1=1200262&r2=1200263&view=diff == --- tomcat/trunk/webapps/docs/security-howto.xml (original) +++ tomcat/trunk/webapps/docs/security-howto.xml Thu Nov 10 10:48:27 2011 @@ -161,6 +161,12 @@ minutes) so this is limited to 4KB by default to reduce exposure to a DOS attack. + The maxParameterCount attribute controls the + maximum number of parameter and value pairs (GET plus POST) that can + be parsed and stored in the request. Excessive parameters are ignored. + If you want to reject such requests, configure a + FailedRequestFilter. + The xpoweredBy attribute controls whether or not the X-Powered-By HTTP header is sent with each request. If sent, the value of the header contains the Servlet and JSP specification versions, the full @@ -207,6 +213,10 @@ current state of this vulnerability and the work-arounds available see the http://tomcat.apache.org/security-7.html";>Tomcat 7 security page. + + The requiredSecret attribute in AJP connectors + configures shared secret between Tomcat and reverse proxy in front of + Tomcat. It is used to prevent unauthorized connections over AJP protocol. @@ -220,11 +230,19 @@ In a hosted environment where web applications may not be trusted, set the deployXml attribute to false to ignore any - context.xml packaged with the web application that may try to assigned + context.xml packaged with the web application that may try to assign increased privileges to the web application. + This applies to Context + elements in all places where they can be defined: + server.xml file, + default context.xml file, + per-host context.xml.default file, + web application context file in per-host configuration directory + or inside the web application. + The crossContext attribute controls if a context is allowed
svn commit: r1200264 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/ajp.xml webapps/docs/config/filter.xml webapps/docs/config/http.xml webapps/docs/security-howto.xml
Author: kkolinko Date: Thu Nov 10 10:50:31 2011 New Revision: 1200264 URL: http://svn.apache.org/viewvc?rev=1200264&view=rev Log: Merged revision 1200263 from tomcat/trunk: Add links to FailedRequestFilter in several places and do other small documentation improvements. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/ajp.xml tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml tomcat/tc7.0.x/trunk/webapps/docs/security-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 10:50:31 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 +/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
svn commit: r1200265 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Nov 10 10:54:13 2011 New Revision: 1200265 URL: http://svn.apache.org/viewvc?rev=1200265&view=rev Log: Add notes 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=1200265&r1=1200264&r2=1200265&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 10 10:54:13 2011 @@ -69,7 +69,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1195222&view=rev - performance tweaks +1: markt, jfclere -1: -kkolinko: +r1195943,r1198641 are needed, and maybe (r1195531+r1195905, r1195949) +kkolinko: +r1195943,r1198641 are needed, and maybe (r1195531+r1195905, r1195949, r1200218+r1200264) * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52091 Address performance issues related to log creation TagHandlerPool. @@ -108,6 +108,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1199985&view=rev +1: schultz, jfclere -1: +kkolinko: +124, needs documentation, some unresolved issues in Re:r1199980 thread PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200268 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/runtime/TagHandlerPool.java webapps/docs/changelog.xml
Author: kkolinko Date: Thu Nov 10 11:07:48 2011 New Revision: 1200268 URL: http://svn.apache.org/viewvc?rev=1200268&view=rev Log: Merged revision 1190388 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52091 Address performance issues related to log creation in TagHandlerPool. Patch provided by Taiki Sugawara. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 11:07:48 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1174882,1
svn commit: r1200269 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/StandardWrapper.java webapps/docs/changelog.xml
Author: kkolinko Date: Thu Nov 10 11:16:01 2011 New Revision: 1200269 URL: http://svn.apache.org/viewvc?rev=1200269&view=rev Log: Merged revision 1190389 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52091 Address performance issues related to lock contention in StandardWrapper Based on patch provided by Taiki Sugawara. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 11:16:01 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,11743
svn commit: r1200270 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Thu Nov 10 11:17:09 2011 New Revision: 1200270 URL: http://svn.apache.org/viewvc?rev=1200270&view=rev Log: Correct typos 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=1200270&r1=1200269&r2=1200270&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Nov 10 11:17:09 2011 @@ -169,7 +169,7 @@ 52091: Address performance issues related to lock contention -StandardWrapper. Patch provided by Taiki Sugawara. (markt) +in StandardWrapper. Patch provided by Taiki Sugawara. (markt) Switch to using Collections.enumeration() rather than custom code that @@ -257,7 +257,7 @@ 52091: Address performance issues related to log creation -TagHandlerPool. Patch provided by Taiki Sugawara. (markt) +in TagHandlerPool. Patch provided by Taiki Sugawara. (markt) Switch to using Collections.enumeration() rather than custom code that - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52091] TagHandlerPool is slow when high concurrently
https://issues.apache.org/bugzilla/show_bug.cgi?id=52091 --- Comment #6 from Konstantin Kolinko 2011-11-10 11:18:43 UTC --- Fixed in 6.0 and will be in 6.0.34. r1200268 and r1200269 -- 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: r1200273 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/valves/RequestFilterValve.java java/org/apache/catalina/valves/mbeans-descriptors.xml webapps/docs/changelog.xml
Author: kkolinko Date: Thu Nov 10 11:27:10 2011 New Revision: 1200273 URL: http://svn.apache.org/viewvc?rev=1200273&view=rev Log: RequestFilterValve (RemoteAddrValve, RemoteHostValve): - Refactor process() method separating value testing logic into a new method, isAllowed(String) - Expose isAllowValid, isDenyValid properties and the new isAllowed(String) method through JXM (r1198622 in tomcat/trunk, r1198623 in TC7) Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 11:27:10 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,
svn commit: r1200280 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Nov 10 11:51:39 2011 New Revision: 1200280 URL: http://svn.apache.org/viewvc?rev=1200280&view=rev Log: Update note Modified: tomcat/tc5.5.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=1200280&r1=1200279&r2=1200280&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Nov 10 11:51:39 2011 @@ -58,4 +58,4 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1195222&view=rev - performance tweaks +1: markt -1: -kkolinko: +r1195943,r1198641 are needed, and maybe (r1195531+r1195905, r1195949, r1198696) +kkolinko: +r1195943,r1198641 are needed, and maybe (r1195531+r1195905, r1195949, r1200218+r1200264) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #18 from Pid 2011-11-10 11:56:01 UTC --- Monsoon seems to have stalled somewhat -- 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
[Tomcat Wiki] Update of "PoweredBy" by Explore To
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by Explore To:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=380&rev2=381
=== eTools.ch ===
{{http://www.etools.ch/images/logo.gif}} [[http://www.etools.ch/|eTools.ch]]
is a fast and transparent metasearch engine that simultaneously queries major
search engines.
+ === Explore To ===
+ {{http://explore.to/images/Hotlinkexplore/explore_to_small.png}}
[[http://www.explore.to|Explore.To Yellow Pages]] - A local search engine &
Internet only Yellow Pages, (IYP). The site runs a complex business listing
database framed in a taxonomy using Tomcat and other open source programs]]
+
=== FarmDirectory.org ===
[[http://www.farmdirectory.org|FarmDirectory.org]] - Connects producers of
agricultural goods with consumers.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PoweredBy" by Explore To
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by Explore To:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=381&rev2=382
{{http://www.etools.ch/images/logo.gif}} [[http://www.etools.ch/|eTools.ch]]
is a fast and transparent metasearch engine that simultaneously queries major
search engines.
=== Explore To ===
- {{http://explore.to/images/Hotlinkexplore/explore_to_small.png}}
[[http://www.explore.to|Explore.To Yellow Pages]] - A local search engine &
Internet only Yellow Pages, (IYP). The site runs a complex business listing
database framed in a taxonomy using Tomcat and other open source programs]]
+ {{http://explore.to/images/Hotlinkexplore/explore_to_small.png}}
[[http://www.explore.to|Explore.To Yellow Pages]] - A local search engine &
Internet only Yellow Pages, (IYP). The site runs a complex business listing
database framed in a taxonomy using Tomcat and other open source programs.
=== FarmDirectory.org ===
[[http://www.farmdirectory.org|FarmDirectory.org]] - Connects producers of
agricultural goods with consumers.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200302 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko
Date: Thu Nov 10 12:41:33 2011
New Revision: 1200302
URL: http://svn.apache.org/viewvc?rev=1200302&view=rev
Log:
Add sanity check. This method is absent in trunk.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1200302&r1=1200301&r2=1200302&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu
Nov 10 12:41:33 2011
@@ -119,7 +119,7 @@ public final class Parameters {
@Deprecated
public void addParameterValues(String key, String[] newValues) {
-if (key == null) {
+if (key == null || newValues.length == 0) {
return;
}
ArrayList values = paramHashValues.get(key);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200308 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko
Date: Thu Nov 10 12:50:29 2011
New Revision: 1200308
URL: http://svn.apache.org/viewvc?rev=1200308&view=rev
Log:
Revert r1200302. Adding parameter with no values is allowed - see
getParameter().
Sorry for the noise.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1200308&r1=1200307&r2=1200308&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu
Nov 10 12:50:29 2011
@@ -119,7 +119,7 @@ public final class Parameters {
@Deprecated
public void addParameterValues(String key, String[] newValues) {
-if (key == null || newValues.length == 0) {
+if (key == null) {
return;
}
ArrayList values = paramHashValues.get(key);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200316 - /tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko
Date: Thu Nov 10 13:07:12 2011
New Revision: 1200316
URL: http://svn.apache.org/viewvc?rev=1200316&view=rev
Log:
Do not log invalid parameter value unless debug logging is enabled
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=1200316&r1=1200315&r2=1200316&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu Nov 10
13:07:12 2011
@@ -297,9 +297,8 @@ public final class Parameters {
if (nameEnd <= nameStart ) {
if (log.isInfoEnabled()) {
-String extract;
-if (valueEnd >= nameStart) {
-extract = new String(bytes, nameStart,
+if (valueEnd >= nameStart && log.isDebugEnabled()) {
+String extract = new String(bytes, nameStart,
valueEnd - nameStart, DEFAULT_CHARSET);
log.info(sm.getString("parameters.invalidChunk",
Integer.valueOf(nameStart),
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200318 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko Date: Thu Nov 10 13:08:59 2011 New Revision: 1200318 URL: http://svn.apache.org/viewvc?rev=1200318&view=rev Log: Merged revision 1200316 from tomcat/trunk: Do not log invalid parameter value unless debug logging is enabled Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 13:08:59 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 +/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,
svn commit: r1200320 - in /tomcat/trunk/java/org/apache/tomcat/util/http: LocalStrings.properties Parameters.java
Author: kkolinko
Date: Thu Nov 10 13:14:23 2011
New Revision: 1200320
URL: http://svn.apache.org/viewvc?rev=1200320&view=rev
Log:
Fix typo in message name
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=1200320&r1=1200319&r2=1200320&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties Thu
Nov 10 13:14:23 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/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=1200320&r1=1200319&r2=1200320&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu Nov 10
13:14:23 2011
@@ -328,7 +328,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: r1200321 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/LocalStrings.properties java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko Date: Thu Nov 10 13:15:51 2011 New Revision: 1200321 URL: http://svn.apache.org/viewvc?rev=1200321&view=rev Log: Merged revision 1200320 from tomcat/trunk: Fix typo in message name 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 Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 13:15:51 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 +/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
svn commit: r1200323 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Nov 10 13:25:35 2011 New Revision: 1200323 URL: http://svn.apache.org/viewvc?rev=1200323&view=rev Log: Propose updated patch All revisions up to r1200321 should be covered by this. 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=1200323&r1=1200322&r2=1200323&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 10 13:25:35 2011 @@ -65,11 +65,20 @@ PATCHES PROPOSED TO BACKPORT: have a similar method that returns Thread.getName() names. * Improve performance of parameter processing. - http://people.apache.org/~markt/patches/2011-10-29-param-perf-tc6-v2.patch - http://svn.apache.org/viewvc?rev=1195222&view=rev - performance tweaks - +1: markt, jfclere + http://people.apache.org/~kkolinko/patches/2011-11-10_tc6_parameters-v4.patch + +Improve performance of parameter processing for GET and POST requests. +Also add an option to limit the maximum number of parameters processed +per request. This defaults to 1. Excessive parameters are ignored. +Note that FailedRequestFilter can be used to reject the +request if some parameters were ignored. (markt/kkolinko) + + +New filter FailedRequestFilter that will reject a request +if there were errors during HTTP parameter parsing. (kkolinko) + + +1: kkolinko -1: -kkolinko: +r1195943,r1198641 are needed, and maybe (r1195531+r1195905, r1195949, r1200218+r1200264) * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 Fix possible output corruption when compression is - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200339 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Nov 10 14:20:50 2011 New Revision: 1200339 URL: http://svn.apache.org/viewvc?rev=1200339&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1200339&r1=1200338&r2=1200339&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 10 14:20:50 2011 @@ -77,7 +77,7 @@ PATCHES PROPOSED TO BACKPORT: New filter FailedRequestFilter that will reject a request if there were errors during HTTP parameter parsing. (kkolinko) - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
On 09/11/2011 23:39, Konstantin Kolinko wrote:
> Maybe add explicit FIPS mode status check below the above error
> handling? Something like:
>
> if ("on".equalsIgnoreCase(FIPSMode) && !fipsModeActive) {
> fail fatally;
> }
+1
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200398 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: markt Date: Thu Nov 10 16:04:46 2011 New Revision: 1200398 URL: http://svn.apache.org/viewvc?rev=1200398&view=rev Log: Correct comment Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1200398&r1=1200397&r2=1200398&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Nov 10 16:04:46 2011 @@ -445,7 +445,7 @@ public class HostConfig String[] filteredAppPaths = filterAppPaths(appBase.list()); // Deploy XML descriptors from configBase deployDescriptors(configBase, configBase.list()); -// Deploy WARs, and loop if additional descriptors are found +// Deploy WARs deployWARs(appBase, filteredAppPaths); // Deploy expanded folders deployDirectories(appBase, filteredAppPaths); @@ -506,7 +506,7 @@ public class HostConfig File xml = new File(configBase, baseName + ".xml"); if (xml.exists()) deployDescriptor(cn, xml); -// Deploy WARs, and loop if additional descriptors are found +// Deploy WARs File war = new File(appBase, baseName + ".war"); if (war.exists()) deployWAR(cn, war); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200399 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: markt
Date: Thu Nov 10 16:05:24 2011
New Revision: 1200399
URL: http://svn.apache.org/viewvc?rev=1200399&view=rev
Log:
When deploying a specific named app, don't try and deploy it multiple
ways.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1200399&r1=1200398&r2=1200399&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Nov 10
16:05:24 2011
@@ -502,15 +502,19 @@ public class HostConfig
return;
}
-// Deploy XML descriptors from configBase
+// Deploy XML descriptor from configBase
File xml = new File(configBase, baseName + ".xml");
-if (xml.exists())
+if (xml.exists()) {
deployDescriptor(cn, xml);
-// Deploy WARs
+return;
+}
+// Deploy WAR
File war = new File(appBase, baseName + ".war");
-if (war.exists())
+if (war.exists()) {
deployWAR(cn, war);
-// Deploy expanded folders
+return;
+}
+// Deploy expanded folder
File dir = new File(appBase, baseName);
if (dir.exists())
deployDirectory(cn, dir);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Problem deploying WAR with manager app in trunk
On 07/11/2011 14:02, Konstantin Kolinko wrote: > 07-Nov-2011 16:38:01.718 SEVERE [http-bio-8080-exec-2] > org.apache.catalina.startup.HostConfig.deployDirectory Error deploying > web application directory C:\(...)\build\webapps\examples3 > java.lang.IllegalArgumentException: addChild: Child name > '/examples3' is not unique Opps. Sorry. My mistake. The threaded deployment changes introduced that issue. I'm just commited the fix to trunk and I'll back-port it to 7.0.x. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200400 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java
Author: markt Date: Thu Nov 10 16:07:16 2011 New Revision: 1200400 URL: http://svn.apache.org/viewvc?rev=1200400&view=rev Log: Correct comment Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 16:07: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 +/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,1
Re: Redeploy on context.xml changes (Was: Tagging 7.0.23)
On 08/11/2011 22:49, Mark Thomas wrote: > I found some time today to look at this. Summarising the issues so far: > > 1. I have separately applied a couple of minor fixes that were included > in the larger patch. > > 2. Renaming watchedResources -> reloadResoucres > Agree with reverting this change > > 3. Adding JavaDoc to FailedContext > Agree with doing this. I tweaked the wording a little bit as it might > not be a StandardContext instance that we failed to create > > 3. Formatting of FailedContext > Given that the majority of the code is NO-OP and the rest is pretty much > getters/setters the current formatting is deliberate to reduce the > length of the file. I did something similar for WebXml. > > 4. s/absolue/absolute/ > Drat. Missed this first time around. Fixed now. > > 5. redeployResource has been implemented for FailedContext > > 6. Unexpected deletion of resources due to adding conf/context.xml to > redeployResources > - removed redeployResources from Context > - ensure global resources are never deleted > - add global resources at end of redeploy list > > > Particularly with the changes for 6, the patch should be easier to read. > > The patch is here: > http://people.apache.org/~markt/patches/2011-11-08-redeploy-trunk-v4.patch > > There are currently a few open TC7 bugs so fixing those should provide > enough time to review this patch before the 7.0.23 tag. It has been a couple of days and no objections so I plan to apply this patch in the next day or so and tag 7.0.23 early next week. That should give me time to fix the remaining open bug and any unit test and/or TCK failures that appear. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200401 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java
Author: markt Date: Thu Nov 10 16:09:45 2011 New Revision: 1200401 URL: http://svn.apache.org/viewvc?rev=1200401&view=rev Log: When deploying a specific named app, don't try and deploy it multiple ways. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 16:09:45 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 +/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,11849
DO NOT REPLY [Bug 52163] Wide classpath for DeployTask
https://issues.apache.org/bugzilla/show_bug.cgi?id=52163 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2011-11-10 16:11:27 UTC --- Yes, it is intentional. See also bug 51621. -- 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
Re: svn commit: r1199980 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java catalina/core/LocalStrings.properties tomcat/jni/SSL.java
Mark,
On 11/10/11 6:28 AM, Mark Thomas wrote:
> On 09/11/2011 23:39, Konstantin Kolinko wrote:
>> Maybe add explicit FIPS mode status check below the above error
>> handling? Something like:
>>
>> if ("on".equalsIgnoreCase(FIPSMode) && !fipsModeActive) {
>> fail fatally;
>> }
>
> +1
Sounds good to me. What about checking for either FIPS *or* SSL
initialization failure? I suppose that the connector will bomb if SSL
doesn't initialize properly.
-chris
signature.asc
Description: OpenPGP digital signature
svn commit: r1200445 - /tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Author: schultz
Date: Thu Nov 10 17:35:22 2011
New Revision: 1200445
URL: http://svn.apache.org/viewvc?rev=1200445&view=rev
Log:
Made FIPS-related errors fatal to AprLifecycleListener.
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1200445&r1=1200444&r2=1200445&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Thu
Nov 10 17:35:22 2011
@@ -108,8 +108,19 @@ public class AprLifecycleListener
try {
initializeSSL();
} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.error(sm.getString("aprListener.sslInit"), t);
+// FIPS Errors are always fatal
+if("on".equalsIgnoreCase(FIPSMode)
+ && !isFIPSModeActive()) {
+if(t instanceof Error)
+ throw (Error)t;
+else if(t instanceof RuntimeException)
+throw (RuntimeException)t;
+else
+throw new
IllegalStateException(sm.getString("aprListener.sslInit"), t);
+} else {
+ExceptionUtils.handleThrowable(t);
+log.error(sm.getString("aprListener.sslInit"), t);
+}
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200446 - /tomcat/trunk/webapps/docs/config/listeners.xml
Author: schultz Date: Thu Nov 10 17:39:45 2011 New Revision: 1200446 URL: http://svn.apache.org/viewvc?rev=1200446&view=rev Log: Added documentation for "FIPSMode" attribute in AprLifecycleListener. Modified: tomcat/trunk/webapps/docs/config/listeners.xml Modified: tomcat/trunk/webapps/docs/config/listeners.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1200446&r1=1200445&r2=1200446&view=diff == --- tomcat/trunk/webapps/docs/config/listeners.xml (original) +++ tomcat/trunk/webapps/docs/config/listeners.xml Thu Nov 10 17:39:45 2011 @@ -110,6 +110,15 @@ this to /dev/urandom to allow quicker start times. + +Set to "on" to instruct OpenSSL to go into FIPS mode. +FIPS mode requires you to have a FIPS-capable OpenSSL library which +you must build yourself. +FIPS mode also requires Tomcat native library version 1.1.23 or later, +which must be built against the FIPS-compatible OpenSSL library. +The default value is off. + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200448 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/config/listeners.xml
Author: schultz
Date: Thu Nov 10 17:43:07 2011
New Revision: 1200448
URL: http://svn.apache.org/viewvc?rev=1200448&view=rev
Log:
Back-ported documentation and error-handling improvements for
AprLifecycleListener FIPSMode.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1200448&r1=1200447&r2=1200448&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Thu Nov 10 17:43:07 2011
@@ -108,8 +108,19 @@ public class AprLifecycleListener
try {
initializeSSL();
} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-log.error(sm.getString("aprListener.sslInit"), t);
+// FIPS Errors are always fatal
+if("on".equalsIgnoreCase(FIPSMode)
+ && !isFIPSModeActive()) {
+if(t instanceof Error)
+ throw (Error)t;
+else if(t instanceof RuntimeException)
+throw (RuntimeException)t;
+else
+throw new
IllegalStateException(sm.getString("aprListener.sslInit"), t);
+} else {
+ExceptionUtils.handleThrowable(t);
+log.error(sm.getString("aprListener.sslInit"), t);
+}
}
}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml?rev=1200448&r1=1200447&r2=1200448&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml Thu Nov 10 17:43:07
2011
@@ -110,6 +110,14 @@
this to /dev/urandom to allow quicker start times.
+
+Set to "on" to instruct OpenSSL to go into FIPS mode.
+FIPS mode requires you to have a FIPS-capable OpenSSL library which
+you must build yourself.
+FIPS mode also requires Tomcat native library version 1.1.23 or later,
+which must be built against the FIPS-compatible OpenSSL library.
+The default value is off.
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200450 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: schultz Date: Thu Nov 10 17:48:18 2011 New Revision: 1200450 URL: http://svn.apache.org/viewvc?rev=1200450&view=rev Log: Updated backport proposal. 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=1200450&r1=1200449&r2=1200450&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 10 17:48:18 2011 @@ -90,11 +90,12 @@ PATCHES PROPOSED TO BACKPORT: * 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: +124, needs documentation, some unresolved issues in Re:r1199980 thread - PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48903] ClassLoader deadlock when compiling JSP pages in 6.0.26
https://issues.apache.org/bugzilla/show_bug.cgi?id=48903 Greg Walters changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #12 from Greg Walters 2011-11-10 18:19:00 UTC --- I've been able to confirm that this bug has not been fixed in 6.0.28 and 6.0.33. Possible regression? I'll attach a full log as soon as I get permission to release the logs but in the meantime here's the stack-trace I get: ** @40004ebc0ed6372bb204 "http-scrubbed%2F172.18.12.12-8083-144" daemon prio=10 tid=0x2aaae40c9800 nid=0x4d09 waiting for moni tor entry [0x4b0dd000] @40004ebc0ed6372bb9d4java.lang.Thread.State: BLOCKED (on object monitor) @40004ebc0ed6372bbdbc at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1559) @40004ebc0ed6372c07f4 - waiting to lock <0x2aaab41214a0> (a org.apache.catalina.loader.WebappClassLoader) @40004ebc0ed6372c0fc4 at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1526) @40004ebc0ed6372c13ac at org.apache.cxf.common.classloader.ClassLoaderUtils.loadClass(ClassLoaderUtils.java:217) @40004ebc0ed6372c1b7c at org.apache.cxf.jaxws.support.JaxWsServiceConfiguration.getRequestWrapper(JaxWsServiceConfiguration.java:629) @40004ebc0ed6372c36d4 at org.apache.cxf.service.factory.ReflectionServiceFactoryBean.getRequestWrapper(ReflectionServiceFactoryBean.java:2053) @40004ebc0ed6372c428c at org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean.initializeWrapping(JaxWsServiceFactoryBean.java:311) @40004ebc0ed6372c4a5c at org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean.initializeWSDLOperation(JaxWsServiceFactoryBean.java:211) @40004ebc0ed6372c7554 at org.apache.cxf.service.factory.ReflectionServiceFactoryBean.initializeWSDLOperations(ReflectionServiceFactoryBean.java:551) @40004ebc0ed6372c7d24 at org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean.initializeWSDLOperations(JaxWsServiceFactoryBean.java:253) @40004ebc0ed6372c84f4 at org.apache.cxf.service.factory.ReflectionServiceFactoryBean.buildServiceFromWSDL(ReflectionServiceFactoryBean.java:335) @40004ebc0ed6372ca04c at org.apache.cxf.service.factory.ReflectionServiceFactoryBean.initializeServiceModel(ReflectionServiceFactoryBean.java:435) @40004ebc0ed6372cac04 at org.apache.cxf.service.factory.ReflectionServiceFactoryBean.create(ReflectionServiceFactoryBean.java:192) @40004ebc0ed6372cafec at org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean.create(JaxWsServiceFactoryBean.java:164) @40004ebc0ed6372cc75c at org.apache.cxf.jaxws.ServiceImpl.createPort(ServiceImpl.java:408) @40004ebc0ed6372ccb44 at org.apache.cxf.jaxws.ServiceImpl.getPort(ServiceImpl.java:292) @40004ebc0ed6372ccf2c at org.apache.cxf.jaxws.ServiceImpl.getPort(ServiceImpl.java:287) @40004ebc0ed6372cd6fc at javax.xml.ws.Service.getPort(Service.java:161) @40004ebc0ed6372cfa24 at org.jivesoftware.webservices.ServiceProvider.getUserService(ServiceProvider.java:108) @40004ebc0ed6372d01f4 at org.apache.jsp.index_jsp._jspService(index_jsp.java:642) @40004ebc0ed6372d05dc at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70) @40004ebc0ed6372d09c4 at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) @40004ebc0ed6372d0dac at org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:388) @40004ebc0ed6372d2904 at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:313) @40004ebc0ed6372d2cec at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:260) @40004ebc0ed6372d30d4 at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) @40004ebc0ed6372d38a4 at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290) @40004ebc0ed6372d4c2c at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) @40004ebc0ed6372d53fc at com.opensymphony.module.sitemesh.filter.PageFilter.parsePage(PageFilter.java:118) @40004ebc0ed6372d57e4 at com.opensymphony.module.sitemesh.filter.PageFilter.doFilter(PageFilter.java:52) @40004ebc0ed6372d5bcc at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235) @40004ebc0ed6372d8aac at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206) @40004ebc0ed6372d8e94 at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233) @40004ebc0ed6372d9664 at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.ja
DO NOT REPLY [Bug 48903] ClassLoader deadlock when compiling JSP pages in 6.0.26
https://issues.apache.org/bugzilla/show_bug.cgi?id=48903 Greg Walters changed: What|Removed |Added CC||greg.walt...@contegix.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48903] ClassLoader deadlock when compiling JSP pages in 6.0.26
https://issues.apache.org/bugzilla/show_bug.cgi?id=48903 --- Comment #13 from Greg Walters 2011-11-10 18:56:49 UTC --- Created attachment 27920 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27920 Thread dump of tomcat showing blocked threads -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48903] ClassLoader deadlock when compiling JSP pages in 6.0.26
https://issues.apache.org/bugzilla/show_bug.cgi?id=48903 Greg Walters changed: What|Removed |Added Version|6.0.26 |6.0.33 OS/Version|Windows XP |Linux -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48903] ClassLoader deadlock when compiling JSP pages in 6.0.26
https://issues.apache.org/bugzilla/show_bug.cgi?id=48903 Rainer Jung changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #14 from Rainer Jung 2011-11-10 19:39:49 UTC --- There's no deadlock in your thread dump. There's just one thread holding a lock and many other threads queing up behind. The thread that holds the lock is @40004ebc1d9333afcdcc "http-j2ee.www.igniterealtime.org%2F172.18.12.12-8083-145" daemon prio=10 tid=0x2aaae437f000 nid=0x6162 runnable [0x40e39000] @40004ebc1d9333aff0f4java.lang.Thread.State: RUNNABLE @40004ebc1d9333b02b8c at java.lang.Throwable.fillInStackTrace(Native Method) @40004ebc1d9333b02f74 - locked <0x2aaad7afb280> (a java.security.PrivilegedActionException) @40004ebc1d9333b04acc at java.lang.Throwable.(Throwable.java:241) @40004ebc1d9333b0623c at java.lang.Exception.(Exception.java:77) @40004ebc1d9333b079ac at java.security.PrivilegedActionException.(PrivilegedActionException.java:48) @40004ebc1d9333b0911c at java.security.AccessController.doPrivileged(Native Method) @40004ebc1d9333b0ac74 at java.net.URLClassLoader.findClass(URLClassLoader.java:190) @40004ebc1d9333b10a34 at java.lang.ClassLoader.loadClass(ClassLoader.java:307) @40004ebc1d9333b10e1c - locked <0x2aaab360cb98> (a sun.misc.Launcher$AppClassLoader) @40004ebc1d9333b12d5c at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:301) @40004ebc1d9333b13144 - locked <0x2aaab360cb98> (a sun.misc.Launcher$AppClassLoader) @40004ebc1d9333b16024 at java.lang.ClassLoader.loadClass(ClassLoader.java:248) @40004ebc1d9333b17794 at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1595) @40004ebc1d9333b17b7c - locked <0x2aaab4024170> (a org.apache.catalina.loader.WebappClassLoader) As you can see the thread handles an exception. Stack creation for an exception can be quite slow, especially if it happens very often. Bugzilla is not a support forum. Please followup with your problem on the Tomcat users list. Regards, Rainer -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200555 - /tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Author: rjung
Date: Thu Nov 10 21:20:23 2011
New Revision: 1200555
URL: http://svn.apache.org/viewvc?rev=1200555&view=rev
Log:
Add more attributes to manager cloneing when
initializing via a cluster configuration:
- maxInactiveInterval
- sessionIdLength
- processExpiresFrequency
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1200555&r1=1200554&r2=1200555&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Thu Nov 10 21:20:23 2011
@@ -184,6 +184,9 @@ public abstract class ClusterManagerBase
copy.setName("Clone-from-" + getName());
copy.setCluster(getCluster());
copy.maxActiveSessions = getMaxActiveSessions();
+copy.setMaxInactiveInterval(getMaxInactiveInterval());
+copy.setSessionIdLength(getSessionIdLength());
+copy.setProcessExpiresFrequency(getProcessExpiresFrequency());
copy.setNotifyListenersOnReplication(isNotifyListenersOnReplication());
copy.setSessionAttributeFilter(getSessionAttributeFilter());
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200573 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/ClusterManagerBase.java webapps/docs/changelog.xml
Author: rjung Date: Thu Nov 10 21:35:53 2011 New Revision: 1200573 URL: http://svn.apache.org/viewvc?rev=1200573&view=rev Log: Add more attributes to manager cloneing when initializing via a cluster configuration: - maxInactiveInterval - sessionIdLength - processExpiresFrequency Backport of r1200555 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 21:35:53 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 +/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,117927
svn commit: r1200582 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Thu Nov 10 21:46:32 2011 New Revision: 1200582 URL: http://svn.apache.org/viewvc?rev=1200582&view=rev Log: Add proposal. 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=1200582&r1=1200581&r2=1200582&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 10 21:46:32 2011 @@ -96,6 +96,12 @@ PATCHES PROPOSED TO BACKPORT: -1: kkolinko: +124, needs documentation, some unresolved issues in Re:r1199980 thread +* Fix setting of some standard attributes on cluster managers. + Backport of r1200555 from trunk. + http://people.apache.org/~rjung/patches/tc6-cluster-fix-attribute-setting.patch + +1: rjung + -1: + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - 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/2492 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1200555 Blamelist: rjung BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1200588 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Thu Nov 10 21:56:11 2011 New Revision: 1200588 URL: http://svn.apache.org/viewvc?rev=1200588&view=rev Log: Vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1200588&r1=1200587&r2=1200588&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 10 21:56:11 2011 @@ -77,14 +77,14 @@ PATCHES PROPOSED TO BACKPORT: New filter FailedRequestFilter that will reject a request if there were errors during HTTP parameter parsing. (kkolinko) - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 Fix possible output corruption when compression is enabled for a connector and the response is flushed. https://issues.apache.org/bugzilla/attachment.cgi?id=27905 - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50570 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200603 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Nov 10 22:33:16 2011
New Revision: 1200603
URL: http://svn.apache.org/viewvc?rev=1200603&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52121
Fix possible output corruption when compression is enabled for a connector and
the response is flushed.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1200603&r1=1200602&r2=1200603&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 10 22:33:16 2011
@@ -64,13 +64,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=52121
- Fix possible output corruption when compression is
- enabled for a connector and the response is flushed.
- https://issues.apache.org/bugzilla/attachment.cgi?id=27905
- +1: kkolinko, markt, rjung
- -1:
-
* 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
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java?rev=1200603&r1=1200602&r2=1200603&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Thu Nov 10 22:33:16 2011
@@ -35,58 +35,74 @@ public class FlushableGZIPOutputStream e
super(os);
}
-private static final byte[] EMPTYBYTEARRAY = new byte[0];
-private boolean hasData = false;
-
/**
- * Here we make sure we have received data, so that the header has been for
- * sure written to the output stream already.
+ * It is used to reserve one byte of real data so that it can be used when
+ * flushing the stream.
*/
+private byte[] lastByte = new byte[1];
+private boolean hasLastByte = false;
+
@Override
-public synchronized void write(byte[] bytes, int i, int i1)
-throws IOException {
-super.write(bytes, i, i1);
-hasData = true;
+public void write(byte[] bytes) throws IOException {
+write(bytes, 0, bytes.length);
}
@Override
-public synchronized void write(int i) throws IOException {
-super.write(i);
-hasData = true;
+public synchronized void write(byte[] bytes, int offset, int length)
+throws IOException {
+if (length > 0) {
+flushLastByte();
+if (length > 1) {
+super.write(bytes, offset, length - 1);
+}
+rememberLastByte(bytes[offset + length - 1]);
+}
}
@Override
-public synchronized void write(byte[] bytes) throws IOException {
-super.write(bytes);
-hasData = true;
+public synchronized void write(int i) throws IOException {
+flushLastByte();
+rememberLastByte((byte) i);
}
@Override
-public synchronized void flush() throws IOException {
-if (!hasData) {
-return; // do not allow the gzip header to be flushed on its own
-}
-
-// trick the deflater to flush
-/**
- * Now this is tricky: We force the Deflater to flush its data by
- * switching compression level. As yet, a perplexingly simple
workaround
- * for
- * http://developer.java.sun.com/developer/bugParade/bugs/4255743.html
- */
-if (!def.finished()) {
-def.setInput(EMPTYBYTEARRAY, 0, 0);
-
-def.setLevel(Deflater.NO_COMPRESSION);
-deflate();
+public synchronized void close() throws IOException {
+flushLastByte();
+super.close();
+}
-def.setLevel(Deflater.DEFAULT_COMPRESSION);
-deflate();
+private void rememberLastByte(byte b) {
+lastByte[0] = b;
+hasLastByte = true;
+}
-out.flush();
+private void flushLastByte() throws IOException {
+if (hasLastByte) {
+super.write(lastByte, 0, 1);
+hasLastByte = false;
}
+}
-hasData = false; // no more data to flush
+@Override
+public synchronized void flush() throws IOException {
+if (hasLastByte) {
+// - do not allow the gzip header to be flushed
DO NOT REPLY [Bug 52121] corrupt gzip output when compression=on in server.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #10 from Konstantin Kolinko 2011-11-10 22:36:52 UTC --- Applied to 6.0 with r1200603 and will be in 6.0.34. -- 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
Re: buildbot failure in ASF Buildbot on tomcat-trunk
On 10.11.2011 13:46, build...@apache.org wrote: 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/2492 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1200555 Blamelist: rjung BUILD FAILED: failed compile_1 Test failure in org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator. Wasn't that the test that is already known to sporadically fail? Couldn't reproduce here on first run. Will run test in a loop. I don't think the failure is due to r1200555. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-trunk
2011/11/11 Rainer Jung : > On 10.11.2011 13:46, build...@apache.org wrote: >> >> 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/2492 >> >> Buildbot URL: http://ci.apache.org/ >> >> Buildslave for this Build: bb-vm_ubuntu >> >> Build Reason: scheduler >> Build Source Stamp: [branch tomcat/trunk] 1200555 >> Blamelist: rjung >> >> BUILD FAILED: failed compile_1 > > Test failure in > org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator. > Wasn't that the test that is already known to sporadically fail? Couldn't > reproduce here on first run. Will run test in a loop. I don't think the > failure is due to r1200555. > Yes, it is sporadic. Failed 3 or 4 times during the last week. Note, that in the same buildbot run the test occurs twice (bio+nio), but only one fails. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1200582 - /tomcat/tc6.0.x/trunk/STATUS.txt
2011/11/11 : > Author: rjung > Date: Thu Nov 10 21:46:32 2011 > New Revision: 1200582 > > URL: http://svn.apache.org/viewvc?rev=1200582&view=rev > Log: > Add proposal. > > Modified: > tomcat/tc6.0.x/trunk/STATUS.txt > > +* Fix setting of some standard attributes on cluster managers. > + Backport of r1200555 from trunk. > + > http://people.apache.org/~rjung/patches/tc6-cluster-fix-attribute-setting.patch > + +1: rjung > + -1: > + What about property change listeners and other side effects? Similar previous changes in trunk: http://svn.apache.org/viewvc?view=revision&revision=1175155 I think that the same setters are used when configuring the object through Digester and there are no listeners in a newly created object. So unlikely there are side effects. Calling setRandomFile() looks especially suspicious, but anyway if it is never called it is called again at the top of ManagerBase.getRandomBytes(). Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-trunk
On 10.11.2011 14:52, Konstantin Kolinko wrote: 2011/11/11 Rainer Jung: On 10.11.2011 13:46, build...@apache.org wrote: 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/2492 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1200555 Blamelist: rjung BUILD FAILED: failed compile_1 Test failure in org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator. Wasn't that the test that is already known to sporadically fail? Couldn't reproduce here on first run. Will run test in a loop. I don't think the failure is due to r1200555. Yes, it is sporadic. Failed 3 or 4 times during the last week. Note, that in the same buildbot run the test occurs twice (bio+nio), but only one fails. Thanks for conforming. I had run it 40 times in a row with NIO and couldn't reproduce the failure (was on Solaris Sparc though). Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200620 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java webapps/docs/changelog.xml
Author: kkolinko
Date: Thu Nov 10 23:30:18 2011
New Revision: 1200620
URL: http://svn.apache.org/viewvc?rev=1200620&view=rev
Log:
Revert r1200603
Something is broken.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1200620&r1=1200619&r2=1200620&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 10 23:30:18 2011
@@ -64,6 +64,16 @@ 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=52121
+ Fix possible output corruption when compression is
+ enabled for a connector and the response is flushed.
+ https://issues.apache.org/bugzilla/attachment.cgi?id=27905
+ +1: kkolinko, markt, rjung
+ -1: kkolinko: Reverted. Something is wrong. With compression=on and this
patch browsers display blank page.
+wget --tries=1 --save-headers "--header=Accept-Encoding:gzip,deflate"
http://localhost:8080/
+results in "No data received".
+
+
* 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
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java?rev=1200620&r1=1200619&r2=1200620&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Thu Nov 10 23:30:18 2011
@@ -35,74 +35,58 @@ public class FlushableGZIPOutputStream e
super(os);
}
+private static final byte[] EMPTYBYTEARRAY = new byte[0];
+private boolean hasData = false;
+
/**
- * It is used to reserve one byte of real data so that it can be used when
- * flushing the stream.
+ * Here we make sure we have received data, so that the header has been for
+ * sure written to the output stream already.
*/
-private byte[] lastByte = new byte[1];
-private boolean hasLastByte = false;
-
-@Override
-public void write(byte[] bytes) throws IOException {
-write(bytes, 0, bytes.length);
-}
-
@Override
-public synchronized void write(byte[] bytes, int offset, int length)
+public synchronized void write(byte[] bytes, int i, int i1)
throws IOException {
-if (length > 0) {
-flushLastByte();
-if (length > 1) {
-super.write(bytes, offset, length - 1);
-}
-rememberLastByte(bytes[offset + length - 1]);
-}
+super.write(bytes, i, i1);
+hasData = true;
}
@Override
public synchronized void write(int i) throws IOException {
-flushLastByte();
-rememberLastByte((byte) i);
+super.write(i);
+hasData = true;
}
@Override
-public synchronized void close() throws IOException {
-flushLastByte();
-super.close();
-}
-
-private void rememberLastByte(byte b) {
-lastByte[0] = b;
-hasLastByte = true;
-}
-
-private void flushLastByte() throws IOException {
-if (hasLastByte) {
-super.write(lastByte, 0, 1);
-hasLastByte = false;
-}
+public synchronized void write(byte[] bytes) throws IOException {
+super.write(bytes);
+hasData = true;
}
@Override
public synchronized void flush() throws IOException {
-if (hasLastByte) {
-// - do not allow the gzip header to be flushed on its own
-// - do not do anything if there is no data to send
-
-// trick the deflater to flush
-/**
- * Now this is tricky: We force the Deflater to flush its data by
- * switching compression level. As yet, a perplexingly simple
workaround
- * for
- *
http://developer.java.sun.com/developer/bugParade/bugs/4255743.html
- */
-if (!def.finished()) {
-def.setLevel(Deflater.NO_COMPRESSION);
-flushLastByte();
-def.setLevel(Deflater.DEFAULT_COMPRESSION);
-}
+if (!hasData) {
+return; // do not allow the gzip header to be flushed on its own
}
-out.flush();
+
+// trick the deflate
Re: svn commit: r1200582 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 10.11.2011 15:08, Konstantin Kolinko wrote: 2011/11/11: Author: rjung Date: Thu Nov 10 21:46:32 2011 New Revision: 1200582 URL: http://svn.apache.org/viewvc?rev=1200582&view=rev Log: Add proposal. Modified: tomcat/tc6.0.x/trunk/STATUS.txt +* Fix setting of some standard attributes on cluster managers. + Backport of r1200555 from trunk. + http://people.apache.org/~rjung/patches/tc6-cluster-fix-attribute-setting.patch + +1: rjung + -1: + What about property change listeners and other side effects? Similar previous changes in trunk: http://svn.apache.org/viewvc?view=revision&revision=1175155 I think that the same setters are used when configuring the object through Digester and there are no listeners in a newly created object. So unlikely there are side effects. It does. I was curious about the exact stacks where the Manager element in the Cluster in server.xml vs. Manager in Context in context.xml kick in and indeed the setters are called by the Digester. So probably it would even be better to also use the setter for maxActiveSessions. Calling setRandomFile() looks especially suspicious, but anyway if it is never called it is called again at the top of ManagerBase.getRandomBytes(). Yes and it seems safe to be called multiple times. So I'll also switch maxActiveSessions to calling the setter in trunk/tc 7 and add that to the proposed TC 6 patch. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200627 - /tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Author: rjung
Date: Thu Nov 10 23:44:18 2011
New Revision: 1200627
URL: http://svn.apache.org/viewvc?rev=1200627&view=rev
Log:
Use setters when cloning cluster managers
(at least in ClusterManagerBase).
Be consistent and don't be afraid of
property change listeners.
The digester calls the setters as well when
initializing the objects.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1200627&r1=1200626&r2=1200627&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Thu Nov 10 23:44:18 2011
@@ -183,7 +183,7 @@ public abstract class ClusterManagerBase
protected void clone(ClusterManagerBase copy) {
copy.setName("Clone-from-" + getName());
copy.setCluster(getCluster());
-copy.maxActiveSessions = getMaxActiveSessions();
+copy.setMaxActiveSessions(getMaxActiveSessions());
copy.setMaxInactiveInterval(getMaxInactiveInterval());
copy.setSessionIdLength(getSessionIdLength());
copy.setProcessExpiresFrequency(getProcessExpiresFrequency());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1200582 - /tomcat/tc6.0.x/trunk/STATUS.txt
2011/11/11 Rainer Jung : > On 10.11.2011 15:08, Konstantin Kolinko wrote: >> >> 2011/11/11: >>> >>> Author: rjung >>> Date: Thu Nov 10 21:46:32 2011 >>> New Revision: 1200582 >>> >>> URL: http://svn.apache.org/viewvc?rev=1200582&view=rev >>> Log: >>> Add proposal. >>> >>> Modified: >>> tomcat/tc6.0.x/trunk/STATUS.txt >>> >>> +* Fix setting of some standard attributes on cluster managers. >>> + Backport of r1200555 from trunk. >>> + >>> http://people.apache.org/~rjung/patches/tc6-cluster-fix-attribute-setting.patch >>> + +1: rjung >>> + -1: >>> + >> >> What about property change listeners and other side effects? Similar >> previous changes in trunk: >> http://svn.apache.org/viewvc?view=revision&revision=1175155 >> >> I think that the same setters are used when configuring the object >> through Digester and there are no listeners in a newly created object. >> So unlikely there are side effects. > > It does. I was curious about the exact stacks where the Manager element in > the Cluster in server.xml vs. Manager in Context in context.xml kick in and > indeed the setters are called by the Digester. > > So probably it would even be better to also use the setter for > maxActiveSessions. > >> Calling setRandomFile() looks especially suspicious, >> but anyway if it is never called it is called again at the top of >> ManagerBase.getRandomBytes(). > > Yes and it seems safe to be called multiple times. > > So I'll also switch maxActiveSessions to calling the setter in trunk/tc 7 > and add that to the proposed TC 6 patch. > 1) There is a difference whether it creates ManagerBase.randomIS now or only on the next call to getRandomBytes() 2) I think there is a bug in setRandomFile() implementation. Note that there is default value for devRandomSource. Then the code does: File f=new File( devRandomSource ); if( ! f.exists() ) return; ... devRandomSource = null; The following two things are wrong: A. new File(null) will result in an NPE. B. On Windows (or any other configurations where the file does not exist) it will repeatedly call "new File()" and f.exists() on every call to getRandomBytes(), wasting IO I think it should - ignore the call if the argument to setRandomFile() is null - set devRandomSource to null if the file does not exist Because of A. if there was IOException when opening the file you will result with NPE when calling the setter on a clone. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200634 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ha/session/ClusterManagerBase.java webapps/docs/changelog.xml
Author: rjung Date: Thu Nov 10 23:48:52 2011 New Revision: 1200634 URL: http://svn.apache.org/viewvc?rev=1200634&view=rev Log: Use setters when cloning cluster managers (at least in ClusterManagerBase). Be consistent and don't be afraid of property change listeners. The digester calls the setters as well when initializing the objects. Backport of r1200627 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 23:48:52 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,1200555 +/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,117
svn commit: r1200641 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Thu Nov 10 23:55:31 2011 New Revision: 1200641 URL: http://svn.apache.org/viewvc?rev=1200641&view=rev Log: Revoke proposal. Need to think better about null values. 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=1200641&r1=1200640&r2=1200641&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 10 23:55:31 2011 @@ -83,12 +83,6 @@ PATCHES PROPOSED TO BACKPORT: -1: kkolinko: +124, needs documentation, some unresolved issues in Re:r1199980 thread -* Fix setting of some standard attributes on cluster managers. - Backport of r1200555 from trunk. - http://people.apache.org/~rjung/patches/tc6-cluster-fix-attribute-setting.patch - +1: rjung - -1: - PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52121] corrupt gzip output when compression=on in server.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | --- Comment #11 from Konstantin Kolinko 2011-11-11 00:11:03 UTC --- Reverted in 6.0 in r1200620. It is broken. Browsers display empty page with compression="on". Wget says "No data received". As if connection has been closed. Debugging with trunk, there is problem in OutputBuffer.close(). It does: doFlush(false); closed = true; It closes underlying stream without closing FlushableGZIPOutputStream first. Consequently the attempt to write out the last byte at FlushableGZIPOutputStream#close() fails with an IOException. -- 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: r1200696 - /tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Author: kkolinko
Date: Fri Nov 11 02:19:31 2011
New Revision: 1200696
URL: http://svn.apache.org/viewvc?rev=1200696&view=rev
Log:
Fix bug in FlushableGZIPOutputStream:
- It could not flush the last byte, because it should have been done in
finish().
Note that GzipOutputFilter.end() calls finish() explicitly before calling
close().
The tests called close() only and it did not catch this use case.
- Improve IOException handling in flushLastByte(), finish(), close().
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java?rev=1200696&r1=1200695&r2=1200696&view=diff
==
---
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Fri Nov 11 02:19:31 2011
@@ -66,8 +66,26 @@ public class FlushableGZIPOutputStream e
}
@Override
+public synchronized void finish() throws IOException {
+try {
+flushLastByte();
+} catch (IOException ignore) {
+// If our write failed, then trailer write in finish() will fail
+// with IOException as well, but it will leave Deflater in more
+// consistent state.
+}
+super.finish();
+}
+
+@Override
public synchronized void close() throws IOException {
-flushLastByte();
+try {
+flushLastByte();
+} catch (IOException ignored) {
+// Ignore. As OutputStream#close() says, the contract of close()
+// is to close the stream. It does not matter much if the
+// stream is not writable any more.
+}
super.close();
}
@@ -78,8 +96,9 @@ public class FlushableGZIPOutputStream e
private void flushLastByte() throws IOException {
if (hasLastByte) {
-super.write(lastByte, 0, 1);
+// Clear the flag first, because write() may fail
hasLastByte = false;
+super.write(lastByte, 0, 1);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200698 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Author: kkolinko Date: Fri Nov 11 02:22:56 2011 New Revision: 1200698 URL: http://svn.apache.org/viewvc?rev=1200698&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 Merged revision 1200696 from tomcat/trunk: Fix bug in FlushableGZIPOutputStream: - It could not flush the last byte, because it should have been done in finish(). Note that GzipOutputFilter.end() calls finish() explicitly before calling close(). The tests called close() only and it did not catch this use case. - Improve IOException handling in flushLastByte(), finish(), close(). Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 11 02:22: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,1200555,1200627 +/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,1175
DO NOT REPLY [Bug 52121] corrupt gzip output when compression=on in server.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 --- Comment #12 from Konstantin Kolinko 2011-11-11 02:28:26 UTC --- The issue in comment 11 fixed in trunk and 7.0 with r1200696 and r1200698 respectively, will be in 7.0.23. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52121] corrupt gzip output when compression=on in server.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 --- Comment #13 from Konstantin Kolinko 2011-11-11 02:38:54 UTC --- Created attachment 27924 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27924 2011-11-11_tc6_FlushableGZIPOutputStream-v2.patch Updated patch for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200703 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Nov 11 02:41:11 2011 New Revision: 1200703 URL: http://svn.apache.org/viewvc?rev=1200703&view=rev Log: Propose updated patch 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=1200703&r1=1200702&r2=1200703&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 11 02:41:11 2011 @@ -67,12 +67,9 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 Fix possible output corruption when compression is enabled for a connector and the response is flushed. - https://issues.apache.org/bugzilla/attachment.cgi?id=27905 - +1: kkolinko, markt, rjung - -1: kkolinko: Reverted. Something is wrong. With compression=on and this patch browsers display blank page. -wget --tries=1 --save-headers "--header=Accept-Encoding:gzip,deflate" http://localhost:8080/ -results in "No data received". - + https://issues.apache.org/bugzilla/attachment.cgi?id=27924 + +1: kkolinko + -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50570 Apply FIPS mode patch from TC7: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2494 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1200696 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
svn commit: r1200725 - in /tomcat/trunk: java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/config/listeners.xml
Author: kkolinko
Date: Fri Nov 11 03:42:47 2011
New Revision: 1200725
URL: http://svn.apache.org/viewvc?rev=1200725&view=rev
Log:
If FIPSMode="on", treat its initialization failure as fatal, regardless of the
cause,
be it implementation failure or missing tc-native.
Implementation note:
- Message should be logged before throwing. When Bootstrap terminates it does
not print the error in the usual catalina log file. It must be written here.
- Throwing an IllegalStateException is not fatal. Throwing an Error is fatal.
Tested with TCNative 1.1.22 that does not have FIPS support.
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1200725&r1=1200724&r2=1200725&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Fri
Nov 11 03:42:47 2011
@@ -108,21 +108,18 @@ public class AprLifecycleListener
try {
initializeSSL();
} catch (Throwable t) {
-// FIPS Errors are always fatal
-if("on".equalsIgnoreCase(FIPSMode)
- && !isFIPSModeActive()) {
-if(t instanceof Error)
- throw (Error)t;
-else if(t instanceof RuntimeException)
-throw (RuntimeException)t;
-else
-throw new
IllegalStateException(sm.getString("aprListener.sslInit"), t);
-} else {
-ExceptionUtils.handleThrowable(t);
-log.error(sm.getString("aprListener.sslInit"), t);
-}
+ExceptionUtils.handleThrowable(t);
+log.error(sm.getString("aprListener.sslInit"), t);
}
}
+// Failure to initialize FIPS mode is fatal
+if ("on".equalsIgnoreCase(FIPSMode) && !isFIPSModeActive()) {
+Error e = new Error(
+sm.getString("aprListener.initializeFIPSFailed"));
+// Log here, because thrown error might be not logged
+log.fatal(e.getMessage(), e);
+throw e;
+}
}
} else if (Lifecycle.AFTER_DESTROY_EVENT.equals(event.getType())) {
synchronized (lock) {
Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1200725&r1=1200724&r2=1200725&view=diff
==
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Fri Nov 11 03:42:47 2011
@@ -95,11 +95,12 @@
-Name of the SSLEngine to use. off: Do not use SSL, on: Use SSL but
no
-specific ENGINE. The default value is on. This initializes the
+Name of the SSLEngine to use. off: do not use SSL,
+on: use SSL but no specific ENGINE.
+The default value is on. This initializes the
native SSL engine, which must be enabled in the APR/native connector by
the use of the SSLEnabled attribute.
-See the http://www.openssl.org";>Official OpenSSL
website
+See the http://www.openssl.org/";>Official OpenSSL
website
for more details on supported SSL hardware engines and manufacturers.
@@ -111,11 +112,12 @@
-Set to "on" to instruct OpenSSL to go into FIPS mode.
-FIPS mode requires you to have a FIPS-capable OpenSSL library which
-you must build yourself.
+Set to on to instruct OpenSSL to go into FIPS mode.
+FIPS mode requires you to have a FIPS-capable OpenSSL library which
+you must build yourself.
FIPS mode also requires Tomcat native library version 1.1.23 or later,
-which must be built against the FIPS-compatible OpenSSL library.
+which must be built against the FIPS-compatible OpenSSL
library.
+If this attribute is "on", SSLEngine must be enabled as well.
The default value is off.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1200728 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml
Author: kkolinko Date: Fri Nov 11 03:53:53 2011 New Revision: 1200728 URL: http://svn.apache.org/viewvc?rev=1200728&view=rev Log: Merged revision 1200725 from tomcat/trunk: If FIPSMode="on", treat its initialization failure as fatal, regardless of the cause, be it implementation failure or missing tc-native. Updated mergeinfo for previously backported revs of this feature: r1200445 r1200446 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 11 03:53:53 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,1200555,1200627,1200696 +/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,117659
DO NOT REPLY [Bug 52121] corrupt gzip output when compression=on in server.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=52121 --- Comment #14 from Konstantin Kolinko 2011-11-11 04:34:39 UTC --- (In reply to comment #11) >> Debugging with trunk, there is problem in OutputBuffer.close(). >> It does: >> doFlush(false); >> closed = true; >> >> It closes underlying stream without closing FlushableGZIPOutputStream first. >> Consequently the attempt to write out the last byte at >> FlushableGZIPOutputStream#close() fails with an IOException. Just to clear misinformation: the statements quoted above are wrong. It behaved as if the stream were closed, but the real cause was finished Deflater. It has nothing to do with the underlying buffer and the code fragment above. See r1200696 -- 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
