svn commit: r1201069 - in /tomcat/trunk/java/org/apache/coyote: ajp/AjpMessage.java http11/AbstractOutputBuffer.java
Author: rjung
Date: Fri Nov 11 22:07:13 2011
New Revision: 1201069
URL: http://svn.apache.org/viewvc?rev=1201069&view=rev
Log:
Improve multi-byte character handling in Coyote
output for HTTP and AJP.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java?rev=1201069&r1=1201068&r2=1201069&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java Fri Nov 11 22:07:13
2011
@@ -209,10 +209,8 @@ public class AjpMessage {
// but is the only consistent approach within the current
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
-if ((c <= 31) && (c != 9)) {
-c = ' ';
-} else if (c == 127) {
-c = ' ';
+if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
+ c = ' ';
}
appendByte(c);
}
@@ -244,10 +242,8 @@ public class AjpMessage {
// but is the only consistent approach within the current
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
-if ((c <= 31) && (c != 9)) {
-c = ' ';
-} else if (c == 127) {
-c = ' ';
+if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
+ c = ' ';
}
appendByte(c);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1201069&r1=1201068&r2=1201069&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Fri
Nov 11 22:07:13 2011
@@ -473,10 +473,8 @@ public abstract class AbstractOutputBuff
// but is the only consistent approach within the current
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
-if ((c <= 31) && (c != 9)) {
-c = ' ';
-} else if (c == 127) {
-c = ' ';
+if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
+ c = ' ';
}
buf[pos++] = (byte) c;
}
@@ -520,10 +518,8 @@ public abstract class AbstractOutputBuff
// but is the only consistent approach within the current
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
-if ((c <= 31) && (c != 9)) {
-c = ' ';
-} else if (c == 127) {
-c = ' ';
+if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
+ c = ' ';
}
buf[pos++] = (byte) c;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1201076 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ajp/AjpMessage.java java/org/apache/coyote/http11/AbstractOutputBuffer.java webapps/docs/changelog.xml
Author: rjung Date: Fri Nov 11 22:18:27 2011 New Revision: 1201076 URL: http://svn.apache.org/viewvc?rev=1201076&view=rev Log: Improve multi-byte character handling in Coyote output for HTTP and AJP. Backport of r1201069 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 11 22:18:27 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941 +/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,117
svn commit: r1201087 - in /tomcat/trunk/java/org/apache/coyote: ajp/AjpMessage.java http11/AbstractOutputBuffer.java
Author: rjung
Date: Fri Nov 11 22:52:50 2011
New Revision: 1201087
URL: http://svn.apache.org/viewvc?rev=1201087&view=rev
Log:
Fix formatting, sorry for the noise.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java?rev=1201087&r1=1201086&r2=1201087&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java Fri Nov 11 22:52:50
2011
@@ -210,7 +210,7 @@ public class AjpMessage {
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
- c = ' ';
+c = ' ';
}
appendByte(c);
}
@@ -243,7 +243,7 @@ public class AjpMessage {
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
- c = ' ';
+c = ' ';
}
appendByte(c);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1201087&r1=1201086&r2=1201087&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Fri
Nov 11 22:52:50 2011
@@ -474,7 +474,7 @@ public abstract class AbstractOutputBuff
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
- c = ' ';
+c = ' ';
}
buf[pos++] = (byte) c;
}
@@ -519,7 +519,7 @@ public abstract class AbstractOutputBuff
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
- c = ' ';
+c = ' ';
}
buf[pos++] = (byte) c;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1201088 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ajp/AjpMessage.java java/org/apache/coyote/http11/AbstractOutputBuffer.java
Author: rjung Date: Fri Nov 11 22:54:28 2011 New Revision: 1201088 URL: http://svn.apache.org/viewvc?rev=1201088&view=rev Log: Fix formatting, sorry for the noise. Backport of r1201087 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 11 22:54:28 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069 +/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,117
svn commit: r1201090 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Fri Nov 11 23:08:14 2011 New Revision: 1201090 URL: http://svn.apache.org/viewvc?rev=1201090&view=rev Log: 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=1201090&r1=1201089&r2=1201090&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 11 23:08:14 2011 @@ -80,6 +80,13 @@ PATCHES PROPOSED TO BACKPORT: -1: kkolinko: +124, needs documentation, some unresolved issues in Re:r1199980 thread +* Clean up handling multi-byte chars in the connectors. + Backport of r1201069+1201087 from trunk resp. r1201076+r1201088 from TC7 + plus making the JK connector consistent with the Coyote one. + http://people.apache.org/~rjung/patches/connectors_multi-byte_handling_cleanup.patch + +1: kkolinko, rjung, jfclere + -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
svn commit: r1201217 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Sat Nov 12 07:24:32 2011 New Revision: 1201217 URL: http://svn.apache.org/viewvc?rev=1201217&view=rev Log: Add Konstantins review remarks to v2 of 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=1201217&r1=1201216&r2=1201217&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Nov 12 07:24:32 2011 @@ -98,10 +98,9 @@ PATCHES PROPOSED TO BACKPORT: * Clean up handling multi-byte chars in the connectors. Backport of r1201069+1201087 from trunk resp. r1201076+r1201088 from TC7 plus making the JK connector consistent with the Coyote one. - http://people.apache.org/~rjung/patches/connectors_multi-byte_handling_cleanup.patch + http://people.apache.org/~rjung/patches/connectors_multi-byte_handling_cleanup-v2.patch +1: rjung, kkolinko -1: -kkolinko:s/public/private/ in two new methods in MsgAjp. 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: r1201452 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/jk/common/ webapps/docs/
Author: rjung
Date: Sun Nov 13 16:14:02 2011
New Revision: 1201452
URL: http://svn.apache.org/viewvc?rev=1201452&view=rev
Log:
Clean up handling multi-byte chars in the connectors.
Backport of r1201069+1201087 from trunk
resp. r1201076+r1201088 from TC7
plus making the JK connector consistent with the
newer ones.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/JkInputStream.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/MsgAjp.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=1201452&r1=1201451&r2=1201452&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 13 16:14:02 2011
@@ -95,13 +95,6 @@ PATCHES PROPOSED TO BACKPORT:
-1:
-* Clean up handling multi-byte chars in the connectors.
- Backport of r1201069+1201087 from trunk resp. r1201076+r1201088 from TC7
- plus making the JK connector consistent with the Coyote one.
-
http://people.apache.org/~rjung/patches/connectors_multi-byte_handling_cleanup-v2.patch
- +1: rjung, kkolinko, jfclere
- -1:
-
PATCHES/ISSUES THAT ARE STALLED
* Backport JSP unloading patch (BZ48358).
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java?rev=1201452&r1=1201451&r2=1201452&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpMessage.java Sun Nov 13
16:14:02 2011
@@ -218,9 +218,7 @@ public class AjpMessage {
// but is the only consistent approach within the current
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
-if ((c <= 31) && (c != 9)) {
-c = ' ';
-} else if (c == 127) {
+if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
c = ' ';
}
appendByte(c);
@@ -253,9 +251,7 @@ public class AjpMessage {
// but is the only consistent approach within the current
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
-if ((c <= 31) && (c != 9)) {
-c = ' ';
-} else if (c == 127) {
+if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
c = ' ';
}
appendByte(c);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1201452&r1=1201451&r2=1201452&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
Sun Nov 13 16:14:02 2011
@@ -634,9 +634,7 @@ public class InternalAprOutputBuffer
// but is the only consistent approach within the current
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
-if ((c <= 31) && (c != 9)) {
-c = ' ';
-} else if (c == 127) {
+if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
c = ' ';
}
buf[pos++] = (byte) c;
@@ -681,9 +679,7 @@ public class InternalAprOutputBuffer
// but is the only consistent approach within the current
// servlet framework. It must suffice until servlet output
// streams properly encode their output.
-if ((c <= 31) && (c != 9)) {
-c = ' ';
-} else if (c == 127) {
+if (((c <= 31) && (c != 9)) || c == 127 || c > 255) {
c = ' ';
}
buf[pos++] = (byte) c;
Modified:
tomcat/tc6.0.x/tru
svn commit: r1201603 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Mon Nov 14 05:40:08 2011 New Revision: 1201603 URL: http://svn.apache.org/viewvc?rev=1201603&view=rev Log: Propose. 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=1201603&r1=1201602&r2=1201603&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Nov 14 05:40:08 2011 @@ -76,3 +76,12 @@ PATCHES PROPOSED TO BACKPORT: svn propset svn:eol-style native container/webapps/docs/config/filter.xml +1: kkolinko -1: + +* Clean up handling multi-byte chars in the connectors plus makin + the JK connector consistent with the newer ones. + Backport of r1201069+1201087 from trunk resp. r1201076+r1201088 from TC7 + and r1201452 from TC 6. TC 6 patch applies with small offsets: + http://people.apache.org/~rjung/patches/connectors_multi-byte_handling_cleanup-v2.patch + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1202761 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Wed Nov 16 16:10:56 2011 New Revision: 1202761 URL: http://svn.apache.org/viewvc?rev=1202761&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=1202761&r1=1202760&r2=1202761&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 16 16:10:56 2011 @@ -116,7 +116,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix regression in urldecoding of parameters that contain spaces http://svn.apache.org/viewvc?rev=1202705&view=rev (Parameters.java only) - +1: kkolinko + +1: kkolinko, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1203731 - /tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
Author: rjung
Date: Fri Nov 18 16:40:02 2011
New Revision: 1203731
URL: http://svn.apache.org/viewvc?rev=1203731&view=rev
Log:
svn:eol-style native.
Modified:
tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
(contents, props changed)
Modified: tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java?rev=1203731&r1=1203730&r2=1203731&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java Fri
Nov 18 16:40:02 2011
@@ -1,199 +1,199 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jasper.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import org.junit.Test;
-
-
-public class TestFastRemovalDequeue {
-
-@Test
-public void testSinglePushPop() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-
-q.push(o1);
-
-Object r = q.pop();
-
-assertEquals(o1, r);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testDoublePushPop() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-Object o2 = new Object();
-
-q.push(o1);
-q.push(o2);
-
-assertEquals(o2, q.first.getContent());
-assertEquals(o1, q.last.getContent());
-
-Object r1 = q.pop();
-
-assertEquals(o1, r1);
-assertEquals(o2, q.first.getContent());
-assertEquals(o2, q.last.getContent());
-
-
-Object r2 = q.pop();
-assertEquals(o2, r2);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testSingleUnpopPop() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-
-q.unpop(o1);
-
-Object r = q.pop();
-
-assertEquals(o1, r);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testDoubleUnpopPop() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-Object o2 = new Object();
-
-q.unpop(o1);
-q.unpop(o2);
-
-assertEquals(o1, q.first.getContent());
-assertEquals(o2, q.last.getContent());
-
-Object r2 = q.pop();
-
-assertEquals(o2, r2);
-assertEquals(o1, q.first.getContent());
-assertEquals(o1, q.last.getContent());
-
-
-Object r1 = q.pop();
-assertEquals(o1, r1);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testSinglePushUnpush() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-
-q.push(o1);
-
-Object r = q.unpush();
-
-assertEquals(o1, r);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testDoublePushUnpush() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-Object o2 = new Object();
-
-q.push(o1);
-q.push(o2);
-
-assertEquals(o2, q.first.getContent());
-assertEquals(o1, q.last.getContent());
-
-Object r2 = q.unpush();
-
-assertEquals(o2, r2);
-assertEquals(o1, q.first.getContent());
-assertEquals(o1, q.last.getContent());
-
-
-Object r1 = q.unpush();
-assertEquals(o1, r1);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testSinglePushRemove() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-
-FastRemovalDequeue.Entry e1 = q.push(o1);
-
-assertEquals(o1, e1.getContent());
-
-
svn commit: r1203732 - /tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
Author: rjung
Date: Fri Nov 18 16:40:55 2011
New Revision: 1203732
URL: http://svn.apache.org/viewvc?rev=1203732&view=rev
Log:
svn:eol-style native.
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
(contents, props changed)
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java?rev=1203732&r1=1203731&r2=1203732&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
Fri Nov 18 16:40:55 2011
@@ -1,199 +1,199 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jasper.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import org.junit.Test;
-
-
-public class TestFastRemovalDequeue {
-
-@Test
-public void testSinglePushPop() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-
-q.push(o1);
-
-Object r = q.pop();
-
-assertEquals(o1, r);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testDoublePushPop() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-Object o2 = new Object();
-
-q.push(o1);
-q.push(o2);
-
-assertEquals(o2, q.first.getContent());
-assertEquals(o1, q.last.getContent());
-
-Object r1 = q.pop();
-
-assertEquals(o1, r1);
-assertEquals(o2, q.first.getContent());
-assertEquals(o2, q.last.getContent());
-
-
-Object r2 = q.pop();
-assertEquals(o2, r2);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testSingleUnpopPop() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-
-q.unpop(o1);
-
-Object r = q.pop();
-
-assertEquals(o1, r);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testDoubleUnpopPop() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-Object o2 = new Object();
-
-q.unpop(o1);
-q.unpop(o2);
-
-assertEquals(o1, q.first.getContent());
-assertEquals(o2, q.last.getContent());
-
-Object r2 = q.pop();
-
-assertEquals(o2, r2);
-assertEquals(o1, q.first.getContent());
-assertEquals(o1, q.last.getContent());
-
-
-Object r1 = q.pop();
-assertEquals(o1, r1);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testSinglePushUnpush() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-
-q.push(o1);
-
-Object r = q.unpush();
-
-assertEquals(o1, r);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testDoublePushUnpush() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-Object o2 = new Object();
-
-q.push(o1);
-q.push(o2);
-
-assertEquals(o2, q.first.getContent());
-assertEquals(o1, q.last.getContent());
-
-Object r2 = q.unpush();
-
-assertEquals(o2, r2);
-assertEquals(o1, q.first.getContent());
-assertEquals(o1, q.last.getContent());
-
-
-Object r1 = q.unpush();
-assertEquals(o1, r1);
-assertNull(q.first);
-assertNull(q.last);
-}
-
-
-@Test
-public void testSinglePushRemove() throws Exception {
-FastRemovalDequeue q = new FastRemovalDequeue(2);
-
-Object o1 = new Object();
-
-FastRemovalDequeue.Entry e1 = q.push(o1);
-
-
svn commit: r1204182 - /tomcat/trunk/build.xml
Author: rjung Date: Sun Nov 20 16:46:35 2011 New Revision: 1204182 URL: http://svn.apache.org/viewvc?rev=1204182&view=rev Log: Add .gitginore to text.files list in build.xml which drives fixcrlf. Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1204182&r1=1204181&r2=1204182&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Sun Nov 20 16:46:35 2011 @@ -203,6 +203,7 @@ + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1204187 - in /tomcat/tc7.0.x/trunk: ./ build.xml webapps/docs/changelog.xml
Author: rjung Date: Sun Nov 20 16:57:22 2011 New Revision: 1204187 URL: http://svn.apache.org/viewvc?rev=1204187&view=rev Log: Add .gitignore to text.files list in build.xml which drives fixcrlf. Backport of r1204182 from truk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Nov 20 16:57:22 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1 202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278 +/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,117
svn commit: r1204933 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Tue Nov 22 11:43:37 2011 New Revision: 1204933 URL: http://svn.apache.org/viewvc?rev=1204933&view=rev Log: Vote. 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=1204933&r1=1204932&r2=1204933&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Nov 22 11:43:37 2011 @@ -31,7 +31,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1186763&view=rev Fix a typo in Windows uninstaller: Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. - +1: kkolinko + +1: kkolinko, rjung -1: * Make configuration issue for RemoteAddrValve, RemoteHostValve result @@ -101,7 +101,7 @@ PATCHES PROPOSED TO BACKPORT: 1. svn del build/resources/build.xml 2. apply patch: http://people.apache.org/~kkolinko/patches/2011-11-15_tc55_build.patch - +1: kkolinko + +1: kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52225 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1336515 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Author: rjung
Date: Thu May 10 07:45:41 2012
New Revision: 1336515
URL: http://svn.apache.org/viewvc?rev=1336515&view=rev
Log:
Add public method to retrieve the current connectionCount
from an endpoint.
It will also show up in the ThreadPool MBean.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1336515&r1=1336514&r2=1336515&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu May
10 07:45:41 2012
@@ -173,6 +173,14 @@ public abstract class AbstractEndpoint {
}
public int getMaxConnections() { return this.maxConnections; }
+
+public long getConnectionCount() {
+if (connectionLimitLatch != null) {
+return connectionLimitLatch.getCount();
+}
+return -1;
+}
+
/**
* External Executor based thread pool.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1336516 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml
Author: rjung
Date: Thu May 10 07:50:29 2012
New Revision: 1336516
URL: http://svn.apache.org/viewvc?rev=1336516&view=rev
Log:
Add public method to retrieve the current connectionCount
from an endpoint.
It will also show up in the ThreadPool MBean.
Backport of r1336515 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1336515
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1336516&r1=1336515&r2=1336516&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Thu May 10 07:50:29 2012
@@ -173,6 +173,14 @@ public abstract class AbstractEndpoint {
}
public int getMaxConnections() { return this.maxConnections; }
+
+public long getConnectionCount() {
+if (connectionLimitLatch != null) {
+return connectionLimitLatch.getCount();
+}
+return -1;
+}
+
/**
* External Executor based thread pool.
*/
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=1336516&r1=1336515&r2=1336516&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu May 10 07:50:29 2012
@@ -121,6 +121,11 @@
The new default value will never go above 2 regardless of
available processors. (fhanik)
+
+Allow to retrieve the current connectionCount
+via getter from the endpoint and as JMX attribute of the ThreadPool
+mbean. (rjung)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1337494 - /tomcat/jk/trunk/native/scripts/build/unix/config.sub
Author: rjung Date: Sat May 12 10:07:36 2012 New Revision: 1337494 URL: http://svn.apache.org/viewvc?rev=1337494&view=rev Log: Update config.sub from http://git.savannah.gnu.org/gitweb/?p=config.git. config.guess is still recent. Modified: tomcat/jk/trunk/native/scripts/build/unix/config.sub Modified: tomcat/jk/trunk/native/scripts/build/unix/config.sub URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/scripts/build/unix/config.sub?rev=1337494&r1=1337493&r2=1337494&view=diff == --- tomcat/jk/trunk/native/scripts/build/unix/config.sub (original) +++ tomcat/jk/trunk/native/scripts/build/unix/config.sub Sat May 12 10:07:36 2012 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -225,6 +225,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1339522 - in /tomcat/jk/trunk/xdocs: reference/apache.xml webserver_howto/apache.xml
Author: rjung Date: Thu May 17 09:02:19 2012 New Revision: 1339522 URL: http://svn.apache.org/viewvc?rev=1339522&view=rev Log: BZ53252: trivial typo fixes in docs. Provided by Sajad Bashir. Modified: tomcat/jk/trunk/xdocs/reference/apache.xml tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Modified: tomcat/jk/trunk/xdocs/reference/apache.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/apache.xml?rev=1339522&r1=1339521&r2=1339522&view=diff == --- tomcat/jk/trunk/xdocs/reference/apache.xml (original) +++ tomcat/jk/trunk/xdocs/reference/apache.xml Thu May 17 09:02:19 2012 @@ -983,7 +983,7 @@ More complex patterns in JkUnMount worke the Apache document space. It enables Apache to serve a static context while Tomcat serving dynamic context. This directive is used for convenience so that you don't have to put an apache Alias directive for each application directory inside Tomcat's -webapp directory. For security reasons is is strongly recommended that JkMount +webapp directory. For security reasons it is strongly recommended that JkMount is used to pass all requests to Tomcat by default and JkUnMount is used to explicitly exclude static content to be served by httpd. It should also be noted that content served by httpd will bypass any security constraints defined in the Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1339522&r1=1339521&r2=1339522&view=diff == --- tomcat/jk/trunk/xdocs/webserver_howto/apache.xml (original) +++ tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Thu May 17 09:02:19 2012 @@ -215,7 +215,7 @@ mod_jk requires two entities: -mod_jk.xxx - The Apache HTTP Server module, depending on your operating system, it will be mod_jk.so, mod_jk.nlm or +mod_jk.xxx - The Apache HTTP Server module, depending on your operating system, it will be mod_jk.so, mod_jk.nlm or MOD_JK.SRVPGM (see the build section). @@ -763,7 +763,7 @@ of passing the request to Tomcat. -Caution: For security reasons is is strongly recommended that JkMount is used to +Caution: For security reasons it is strongly recommended that JkMount is used to pass all requests to Tomcat by default and JkUnMount is used to explicitly exclude static content to be served by httpd. It should also be noted that content served by httpd will bypass any security constraints defined in the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1339594 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Thu May 17 13:27:40 2012 New Revision: 1339594 URL: http://svn.apache.org/viewvc?rev=1339594&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=1339594&r1=1339593&r2=1339594&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 17 13:27:40 2012 @@ -83,7 +83,7 @@ PATCHES PROPOSED TO BACKPORT: 2) Patch http://people.apache.org/~kkolinko/patches/2012-01-18_tc6_LicenseRtf.patch - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52579 @@ -141,8 +141,10 @@ PATCHES PROPOSED TO BACKPORT: * Fix bug https://issues.apache.org/bugzilla/show_bug.cgi?id=52858 http://svn.apache.org/viewvc?rev=1300948&view=rev - +1: fhanik, markt + +1: fhanik, markt, rjung -1: + rjung: Isn't this only fixing the regression introduced by 52858 (BZ 53138) + but 52858 will be again unfixed? * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52918 Add WebSocket support to Tomcat 6 @@ -154,7 +156,7 @@ PATCHES PROPOSED TO BACKPORT: It is backport of the following revs of 7.0.x: r1300557 r1301269 r1305197 http://people.apache.org/~kkolinko/patches/2012-03-26_tc6_update_deps.patch - +1: kkolinko + +1: kkolinko, rjung -1: * Backport UserDataHelper class (issue 52184) @@ -193,7 +195,7 @@ PATCHES PROPOSED TO BACKPORT: e.g. duplicate tag preceding and following http://people.apache.org/~kkolinko/patches/2012-05-13_tc6_sampleservlets.patch (backport of revs 1337719 1337734 1337741 1337745) - +1: kkolinko + +1: kkolinko, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350175 - in /tomcat/site/trunk: docs/download-connectors.html docs/download-native.html xdocs/download-connectors.xml xdocs/download-native.xml
Author: rjung Date: Thu Jun 14 10:10:51 2012 New Revision: 1350175 URL: http://svn.apache.org/viewvc?rev=1350175&view=rev Log: Reinstate path to connectors KEYS file in key checking instructions. Currently we don't have a unified KEYS file but about 5 different ones. Modified: tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-connectors.xml tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1350175&r1=1350174&r2=1350175&view=diff == --- tomcat/site/trunk/docs/download-connectors.html (original) +++ tomcat/site/trunk/docs/download-connectors.html Thu Jun 14 10:10:51 2012 @@ -376,7 +376,7 @@ You must verify the integrity of the downloaded files. We provide OpenPGP signatures for every release file. This signature should be matched against the -http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS file +http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS file which contains the OpenPGP keys of Tomcat's Release Managers. We also provide an MD5 checksum for every release file. After you download the file, you should calculate a checksum for your download, Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1350175&r1=1350174&r2=1350175&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Thu Jun 14 10:10:51 2012 @@ -361,7 +361,7 @@ You must verify the integrity of the downloaded files. We provide OpenPGP signatures for every release file. This signature should be matched against the -http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS file +http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS file which contains the OpenPGP keys of Tomcat's Release Managers. We also provide an MD5 checksum for every release file. After you download the file, you should calculate a checksum for your download, Modified: tomcat/site/trunk/xdocs/download-connectors.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?rev=1350175&r1=1350174&r2=1350175&view=diff == --- tomcat/site/trunk/xdocs/download-connectors.xml (original) +++ tomcat/site/trunk/xdocs/download-connectors.xml Thu Jun 14 10:10:51 2012 @@ -96,7 +96,7 @@ You must verify the integrity of the downloaded files. We provide OpenPGP signatures for every release file. This signature should be matched against the -http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS file +http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS file which contains the OpenPGP keys of Tomcat's Release Managers. We also provide an MD5 checksum for every release file. After you download the file, you should calculate a checksum for your download, Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1350175&r1=1350174&r2=1350175&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Thu Jun 14 10:10:51 2012 @@ -88,7 +88,7 @@ You must verify the integrity of the downloaded files. We provide OpenPGP signatures for every release file. This signature should be matched against the -http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS file +http://www.apache.org/dist/tomcat/tomcat-connectors/KEYS";>KEYS file which contains the OpenPGP keys of Tomcat's Release Managers. We also provide an MD5 checksum for every release file. After you download the file, you should calculate a checksum for your download, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r691 - in /release/tomcat: tomcat-6/KEYS tomcat-7/KEYS tomcat-connectors/KEYS
Author: rjung Date: Thu Jun 14 12:19:51 2012 New Revision: 691 Log: Update top level KEYS files with keys added to the "released" KEYS files. I did not remove old KEYS gone in the releases, because they might still be useful to verify old releases. There seems to be no mechanism to keep these top level files in sync with the ones in the sub directories belonging to individual releases. Modified: release/tomcat/tomcat-6/KEYS release/tomcat/tomcat-7/KEYS release/tomcat/tomcat-connectors/KEYS Modified: release/tomcat/tomcat-6/KEYS == --- release/tomcat/tomcat-6/KEYS (original) +++ release/tomcat/tomcat-6/KEYS Thu Jun 14 12:19:51 2012 @@ -253,8 +253,56 @@ =r1gT -END PGP PUBLIC KEY BLOCK- +pub 1024D/41E49465 2006-11-08 + Key fingerprint = 80FF 76D8 8A96 9FE4 6108 558A 80B9 53A0 41E4 9465 +uid Remy Maucherat +sig 341E49465 2006-11-08 Remy Maucherat +sub 4096g/D07A28EB 2006-11-08 +sig 41E49465 2006-11-08 Remy Maucherat + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.2.2 (FreeBSD) + +mQGiBEVRM9MRBACUu2eecHcv9rzUfpvsAIkeAEXubebzBQOHCmfziV1DoARrhe4p +6ZT7bxy0mdOcwd5AhcUskRpa++vjmp7eVzfrecnGrI1lE/yQx7kH+HM3LXYBsZfu +wHDinvj0LsfPsC3kebbajBuyTlXkGO04wng7uFmGhMVHMaQv7n6EYv4mZwCgwd+v +cHtSA/jqQerji7//9pPydzUD/iLe7XQNaftiUJIodNyrvWwGkhc9lfhIQwxXFKsX +qbEUXXXm3L/FXJ9raaqaQQ8xS1fWRp1ojfifrbgTqt+a32gOL3IYtsO0/btiY4wF +KE+7mhsgNytyQtvn3MpoNQXYRo6ikmVG/Qi/JcjOUQBgo7l6rF6+iaic1lF/aHaG +6BT5A/43gcjkc7RNJEcuFa2RCgbre25FQ0IQxyZkrIg3L4EFVFAGeiKl6NdM4VZq +SBkA/Vgw3MGRDk23EMXaV1gG20iXuWaqfmnme77xDIME9T/Qud0kLJN7UIi2kapJ +w630ZJK/WxV3KY3XQ8chQxJcSoIyR1Kw0bmVHvc7c4TUkYBYk7QgUmVteSBNYXVj +aGVyYXQgPHJlbW1AYXBhY2hlLm9yZz6IYAQTEQIAIAUCRVEz0wIbAwYLCQgHAwIE +FQIIAwQWAgMBAh4BAheAAAoJEIC5U6BB5JRlCYsAoIfezo8wV6jPsrsm5RjyBdEC +2DKuAKCHb3e28i2OFUmvoRWxQrhLGpWIurkEDQRFUTR5EBAA60t9ry4FGirmBlje +uPIfsN5KAHqV/5Tunyhvya4Y94NhBIdj22c0SeA/rlUb0t26rBSZlNaCDK24+PpM +dIaQEun8YoWMlu0nMbGQn/RQZPb++Mbcht0Ei0x+AHQyTWPK9WGtr9y3vGeqkAiq +FhuSLSv2BLrpaqg9uY2VjVzJZS/Z+6DJHZp2nOnJJp4Tsgk9G289H/aAldgNY5mQ +M/LUhRSqKuIqGmJVWgoNhoerVYOYoH3ar0lRaJv+THIuqb8DgqU09zLnRJBC7Ydm +rcLi455xcYBlvQHD4DzLHqqjZeJP+lgTnO7Jt3zWX+MjxIZF7kwDJ5+3f7gCzVEU +wav+SDwxhuU4dMclbCZIuku5pkNaEox2b9seCFnYo3l6XKzMZEIj1+HHeKMfttq+ +oo9WQNpd/B+JI1zabfkDThlWOT2vNvgcFE720GGUtGuxLCkGiVjxn/PJZKQ2PY68 +MHUqHyWagyzXp+4VITL27V7K8w6zzQD2MMOAUGp0GOYGwLqqG0CE/ArOIgdr7dmc +89J2TusBRVLS5W8KMlWfjmdxgInai50k+d1sC3j96bGbcO7q7f5xuRBYily6RShX +JvyQBlXrYHE6XPMLAyj+0PokikV2Il9QHlMV41qcFJcoI+JeT4q9uyBGj23nz69k +AJEwIxLd6RqZfAGDYHqRALpIZzcAAwUP+webwWjbPEMs3RvW3HS2zZoQjcz3kczJ +StssueyV8pUR7vRzw+pMqIO3QdoHTrjM15fepX5WZfle+BDwgGCTeDNle90uV5Tw +uXQN7oGCTEmrowkCzAAf3KVZdJqgFfYsCCRPpF8aEEueBhvry9Tm/I2MCxXVGDrv +x8jGbU9tHMM7uMXQu1VjyJ4FAAwjAMpck7ZYNDwW6ZHSjnem820ZIeKXK5wGytYn +KIpAmnjBJpnSpwuBqAF2rqpu8yU1CLJkFM7TnPkwCDdUhiuemTkn1nAkuK1Yx7ST +VwTXMyb5pMKJP6XED4iD7w+no+oVU5wkS3AOL9LZq8LixWdFuYlbrubhA8VeI2su +WPqapCErjA3NUZQJpR1sTSKFszs7zv2ZKf41r+Koam1hstKuVoARgncAFfCCvTI7 +qOdthZG4KbNPExaQpSM/8eiQh76VO9XzElW3xbMLigKDZiWzMhB8h8mmummvZ88c +qX6GX5+X9raEwBuI92ncjPgAdgXiBtGkecBBk6aW2xq4Q8mxf3wMlC3G0NFA8S+v +MMqWbkP9rH2zVaKhP2Z5iRtMWtv4aErmQbpQE4njn1Hq8/+2DH2jbsaAbjDGoRCT +kj3S/Nggbfeokc7ADy1fiAp53KAmFJ/V1deljsvSAgsHowvWEokgE3L19Ze9PTYS +75jSWQugU1pBiEkEGBECAAkFAkVRNHkCGwwACgkQgLlToEHklGU7IgCeNQ0uTbpc +7WnKtnFOYi9RY4dVN74AoIRJjsMmkpO++KflIhY3UtzKGmTy +=lDGt +-END PGP PUBLIC KEY BLOCK- + pub 1024D/288584E7 2008-07-02 -uid Rémy Maucherat +uid Rémy Maucherat sub 4096g/4B6FAEFB 2008-07-02 -BEGIN PGP PUBLIC KEY BLOCK- Modified: release/tomcat/tomcat-7/KEYS == --- release/tomcat/tomcat-7/KEYS (original) +++ release/tomcat/tomcat-7/KEYS Thu Jun 14 12:19:51 2012 @@ -464,3 +464,62 @@ Io8ZP0E= =xT1M -END PGP PUBLIC KEY BLOCK- +pub 4096R/731FABEE 2011-05-27 + Key fingerprint = 9BA4 4C26 2138 5CB9 66EB A586 F72C 284D 731F ABEE +uid Tim Whittington (CODE SIGNING KEY) +sig 3731FABEE 2011-05-27 Tim Whittington (CODE SIGNING KEY) +sub 4096R/461B342D 2011-05-27 +sig 731FABEE 2011-05-27 Tim Whittington (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.11 (Darwin) + +mQINBE3fcdABEADmpbGMmnQiMc4biU+CIhV6EJ7lBaRzXzh4tJ4eITfw6IbImDRn +0JHZNjeE5zXLeH0PQ0K8/bYzFhMGwQOgvZETV7LPVLid6F9LbvDnItcWyoiZ+HPG +9SNdxIAsIVxchW6j/4NcIWaEwJks/+3vveBbRc1q0UgL5b72Yxpwwk3o6LMb08vJ +wn0LuljqM/+MHc+/KuxO54jJZ2OwNbKr2cxsYwVCpj+vEF6wNh2s6v+5VLs7NimN +UufiKVGcz6fceza3eYOS+0aLe4JXUPfmbad55x7H7wGMbfv+XLsBUKJ9Bz5nF3QD +jLwGBId8/K51yXGqZUqwjzTkhIalJeZEMZuAxGkLXsYM47OH/BGPNvqfcX6X+17i +9urz5go5kWQJJLGiBDVxiwpyrcZfrqc2I0DicLUsAbdyd6q6gkEcQKLCFmm9GTW8 +c0Bb/kqlfGnDcBBl3kwK8MvvTeEAq7mteZEEOu/aV+417qDx+dNzFIx/jVjkihnC +O10vIXKmog8Dy36gNuJdnqsNuV8oGK4vPRFy80XajmYBl94xfR/ZsWWo7y66UGQr
svn commit: r691 - in /release/tomcat: tomcat-6/KEYS tomcat-7/KEYS tomcat-connectors/KEYS
Author: rjung Date: Thu Jun 14 12:19:51 2012 New Revision: 691 Log: Update top level KEYS files with keys added to the "released" KEYS files. I did not remove old KEYS gone in the releases, because they might still be useful to verify old releases. There seems to be no mechanism to keep these top level files in sync with the ones in the sub directories belonging to individual releases. Modified: release/tomcat/tomcat-6/KEYS release/tomcat/tomcat-7/KEYS release/tomcat/tomcat-connectors/KEYS Modified: release/tomcat/tomcat-6/KEYS == --- release/tomcat/tomcat-6/KEYS (original) +++ release/tomcat/tomcat-6/KEYS Thu Jun 14 12:19:51 2012 @@ -253,8 +253,56 @@ =r1gT -END PGP PUBLIC KEY BLOCK- +pub 1024D/41E49465 2006-11-08 + Key fingerprint = 80FF 76D8 8A96 9FE4 6108 558A 80B9 53A0 41E4 9465 +uid Remy Maucherat +sig 341E49465 2006-11-08 Remy Maucherat +sub 4096g/D07A28EB 2006-11-08 +sig 41E49465 2006-11-08 Remy Maucherat + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.2.2 (FreeBSD) + +mQGiBEVRM9MRBACUu2eecHcv9rzUfpvsAIkeAEXubebzBQOHCmfziV1DoARrhe4p +6ZT7bxy0mdOcwd5AhcUskRpa++vjmp7eVzfrecnGrI1lE/yQx7kH+HM3LXYBsZfu +wHDinvj0LsfPsC3kebbajBuyTlXkGO04wng7uFmGhMVHMaQv7n6EYv4mZwCgwd+v +cHtSA/jqQerji7//9pPydzUD/iLe7XQNaftiUJIodNyrvWwGkhc9lfhIQwxXFKsX +qbEUXXXm3L/FXJ9raaqaQQ8xS1fWRp1ojfifrbgTqt+a32gOL3IYtsO0/btiY4wF +KE+7mhsgNytyQtvn3MpoNQXYRo6ikmVG/Qi/JcjOUQBgo7l6rF6+iaic1lF/aHaG +6BT5A/43gcjkc7RNJEcuFa2RCgbre25FQ0IQxyZkrIg3L4EFVFAGeiKl6NdM4VZq +SBkA/Vgw3MGRDk23EMXaV1gG20iXuWaqfmnme77xDIME9T/Qud0kLJN7UIi2kapJ +w630ZJK/WxV3KY3XQ8chQxJcSoIyR1Kw0bmVHvc7c4TUkYBYk7QgUmVteSBNYXVj +aGVyYXQgPHJlbW1AYXBhY2hlLm9yZz6IYAQTEQIAIAUCRVEz0wIbAwYLCQgHAwIE +FQIIAwQWAgMBAh4BAheAAAoJEIC5U6BB5JRlCYsAoIfezo8wV6jPsrsm5RjyBdEC +2DKuAKCHb3e28i2OFUmvoRWxQrhLGpWIurkEDQRFUTR5EBAA60t9ry4FGirmBlje +uPIfsN5KAHqV/5Tunyhvya4Y94NhBIdj22c0SeA/rlUb0t26rBSZlNaCDK24+PpM +dIaQEun8YoWMlu0nMbGQn/RQZPb++Mbcht0Ei0x+AHQyTWPK9WGtr9y3vGeqkAiq +FhuSLSv2BLrpaqg9uY2VjVzJZS/Z+6DJHZp2nOnJJp4Tsgk9G289H/aAldgNY5mQ +M/LUhRSqKuIqGmJVWgoNhoerVYOYoH3ar0lRaJv+THIuqb8DgqU09zLnRJBC7Ydm +rcLi455xcYBlvQHD4DzLHqqjZeJP+lgTnO7Jt3zWX+MjxIZF7kwDJ5+3f7gCzVEU +wav+SDwxhuU4dMclbCZIuku5pkNaEox2b9seCFnYo3l6XKzMZEIj1+HHeKMfttq+ +oo9WQNpd/B+JI1zabfkDThlWOT2vNvgcFE720GGUtGuxLCkGiVjxn/PJZKQ2PY68 +MHUqHyWagyzXp+4VITL27V7K8w6zzQD2MMOAUGp0GOYGwLqqG0CE/ArOIgdr7dmc +89J2TusBRVLS5W8KMlWfjmdxgInai50k+d1sC3j96bGbcO7q7f5xuRBYily6RShX +JvyQBlXrYHE6XPMLAyj+0PokikV2Il9QHlMV41qcFJcoI+JeT4q9uyBGj23nz69k +AJEwIxLd6RqZfAGDYHqRALpIZzcAAwUP+webwWjbPEMs3RvW3HS2zZoQjcz3kczJ +StssueyV8pUR7vRzw+pMqIO3QdoHTrjM15fepX5WZfle+BDwgGCTeDNle90uV5Tw +uXQN7oGCTEmrowkCzAAf3KVZdJqgFfYsCCRPpF8aEEueBhvry9Tm/I2MCxXVGDrv +x8jGbU9tHMM7uMXQu1VjyJ4FAAwjAMpck7ZYNDwW6ZHSjnem820ZIeKXK5wGytYn +KIpAmnjBJpnSpwuBqAF2rqpu8yU1CLJkFM7TnPkwCDdUhiuemTkn1nAkuK1Yx7ST +VwTXMyb5pMKJP6XED4iD7w+no+oVU5wkS3AOL9LZq8LixWdFuYlbrubhA8VeI2su +WPqapCErjA3NUZQJpR1sTSKFszs7zv2ZKf41r+Koam1hstKuVoARgncAFfCCvTI7 +qOdthZG4KbNPExaQpSM/8eiQh76VO9XzElW3xbMLigKDZiWzMhB8h8mmummvZ88c +qX6GX5+X9raEwBuI92ncjPgAdgXiBtGkecBBk6aW2xq4Q8mxf3wMlC3G0NFA8S+v +MMqWbkP9rH2zVaKhP2Z5iRtMWtv4aErmQbpQE4njn1Hq8/+2DH2jbsaAbjDGoRCT +kj3S/Nggbfeokc7ADy1fiAp53KAmFJ/V1deljsvSAgsHowvWEokgE3L19Ze9PTYS +75jSWQugU1pBiEkEGBECAAkFAkVRNHkCGwwACgkQgLlToEHklGU7IgCeNQ0uTbpc +7WnKtnFOYi9RY4dVN74AoIRJjsMmkpO++KflIhY3UtzKGmTy +=lDGt +-END PGP PUBLIC KEY BLOCK- + pub 1024D/288584E7 2008-07-02 -uid Rémy Maucherat +uid Rémy Maucherat sub 4096g/4B6FAEFB 2008-07-02 -BEGIN PGP PUBLIC KEY BLOCK- Modified: release/tomcat/tomcat-7/KEYS == --- release/tomcat/tomcat-7/KEYS (original) +++ release/tomcat/tomcat-7/KEYS Thu Jun 14 12:19:51 2012 @@ -464,3 +464,62 @@ Io8ZP0E= =xT1M -END PGP PUBLIC KEY BLOCK- +pub 4096R/731FABEE 2011-05-27 + Key fingerprint = 9BA4 4C26 2138 5CB9 66EB A586 F72C 284D 731F ABEE +uid Tim Whittington (CODE SIGNING KEY) +sig 3731FABEE 2011-05-27 Tim Whittington (CODE SIGNING KEY) +sub 4096R/461B342D 2011-05-27 +sig 731FABEE 2011-05-27 Tim Whittington (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.11 (Darwin) + +mQINBE3fcdABEADmpbGMmnQiMc4biU+CIhV6EJ7lBaRzXzh4tJ4eITfw6IbImDRn +0JHZNjeE5zXLeH0PQ0K8/bYzFhMGwQOgvZETV7LPVLid6F9LbvDnItcWyoiZ+HPG +9SNdxIAsIVxchW6j/4NcIWaEwJks/+3vveBbRc1q0UgL5b72Yxpwwk3o6LMb08vJ +wn0LuljqM/+MHc+/KuxO54jJZ2OwNbKr2cxsYwVCpj+vEF6wNh2s6v+5VLs7NimN +UufiKVGcz6fceza3eYOS+0aLe4JXUPfmbad55x7H7wGMbfv+XLsBUKJ9Bz5nF3QD +jLwGBId8/K51yXGqZUqwjzTkhIalJeZEMZuAxGkLXsYM47OH/BGPNvqfcX6X+17i +9urz5go5kWQJJLGiBDVxiwpyrcZfrqc2I0DicLUsAbdyd6q6gkEcQKLCFmm9GTW8 +c0Bb/kqlfGnDcBBl3kwK8MvvTeEAq7mteZEEOu/aV+417qDx+dNzFIx/jVjkihnC +O10vIXKmog8Dy36gNuJdnqsNuV8oGK4vPRFy80XajmYBl94xfR/ZsWWo7y66UGQr
svn commit: r1350209 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung
Date: Thu Jun 14 12:21:18 2012
New Revision: 1350209
URL: http://svn.apache.org/viewvc?rev=1350209&view=rev
Log:
Do not distribute KEYS file with releases.
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1350209&r1=1350208&r2=1350209&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Thu Jun 14 12:21:18 2012
@@ -159,7 +159,7 @@ cd "$top"
rm -rf ${JKJNIDIST}/jni/xdocs
mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
rm -rf ${JKJNIDIST}/jni/build
-for i in KEYS LICENSE NOTICE README.txt
+for i in LICENSE NOTICE README.txt
do
svn cat ${JKJNISVN}/${i} > ${JKJNIDIST}/${i}
if [ $? -ne 0 ]; then
@@ -212,7 +212,7 @@ cd "$top"
rm -rf ${JKWINDIST}/jni/xdocs
mv ${JKWINDIST}/jni/build/docs ${JKWINDIST}/jni/docs
rm -rf ${JKWINDIST}/jni/build
-for i in KEYS LICENSE NOTICE README.txt
+for i in LICENSE NOTICE README.txt
do
svn cat ${JKJNISVN}/${i} > ${JKWINDIST}/${i}
$PERL ${JKWINDIST}/jni/native/build/lineends.pl --cr ${JKWINDIST}/${i}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350210 - /tomcat/native/trunk/jnirelease.sh
Author: rjung
Date: Thu Jun 14 12:21:27 2012
New Revision: 1350210
URL: http://svn.apache.org/viewvc?rev=1350210&view=rev
Log:
Do not distribute KEYS file with releases.
Modified:
tomcat/native/trunk/jnirelease.sh
Modified: tomcat/native/trunk/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=1350210&r1=1350209&r2=1350210&view=diff
==
--- tomcat/native/trunk/jnirelease.sh (original)
+++ tomcat/native/trunk/jnirelease.sh Thu Jun 14 12:21:27 2012
@@ -151,7 +151,6 @@ JKWINDIST=tomcat-native-${JKJNIVER}-win3
rm -rf ${JKWINDIST}
mkdir -p ${JKWINDIST}
svn export --native-eol CRLF ${JKJNISVN}/native ${JKWINDIST}/native
-svn cat ${JKJNISVN}/KEYS > ${JKWINDIST}/KEYS
svn cat ${JKJNISVN}/LICENSE > ${JKWINDIST}/LICENSE
svn cat ${JKJNISVN}/NOTICE > ${JKWINDIST}/NOTICE
svn cat ${JKJNISVN}/README.txt > ${JKWINDIST}/README.txt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350212 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Thu Jun 14 12:31:14 2012 New Revision: 1350212 URL: http://svn.apache.org/viewvc?rev=1350212&view=rev Log: Add proposal. 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=1350212&r1=1350211&r2=1350212&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jun 14 12:31:14 2012 @@ -52,3 +52,10 @@ PATCHES PROPOSED TO BACKPORT: https://issues.apache.org/bugzilla/attachment.cgi?id=28895 +1: kkolinko, schultz -1: + +* Remove the KEYS file from the src distribution. + It will still be copied to the release directory but not + be contained in the downloaded tar or zip. + http://people.apache.org/~rjung/patches/remove-keys-from-release-tc55.patch + +1: rjung + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350217 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung
Date: Thu Jun 14 12:50:54 2012
New Revision: 1350217
URL: http://svn.apache.org/viewvc?rev=1350217&view=rev
Log:
Include release script in src release.
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1350217&r1=1350216&r2=1350217&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Thu Jun 14 12:50:54 2012
@@ -135,7 +135,7 @@ JKJNIDIST=tomcat-native-${JKJNIVER}-src
rm -rf ${JKJNIDIST}
mkdir -p ${JKJNIDIST}/jni
-for i in native java xdocs examples test build.xml build.properties.default
+for i in native java xdocs examples test build.xml build.properties.default
jnirelease.sh
do
svn export ${JKJNISVN}/${i} ${JKJNIDIST}/jni/${i}
if [ $? -ne 0 ]; then
@@ -181,7 +181,7 @@ tar -cf - ${JKJNIDIST} | gzip -c9 > ${JK
JKWINDIST=tomcat-native-${JKJNIVER}-win32-src
rm -rf ${JKWINDIST}
mkdir -p ${JKWINDIST}/jni
-for i in native java xdocs examples test build.xml build.properties.default
+for i in native java xdocs examples test build.xml build.properties.default
jnirelease.sh
do
svn export --native-eol CRLF ${JKJNISVN}/${i} ${JKWINDIST}/jni/${i}
if [ $? -ne 0 ]; then
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350218 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung
Date: Thu Jun 14 12:52:48 2012
New Revision: 1350218
URL: http://svn.apache.org/viewvc?rev=1350218&view=rev
Log:
Include xdocs in src distribution.
This facilitates contributing docs patches.
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1350218&r1=1350217&r2=1350218&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Thu Jun 14 12:52:48 2012
@@ -156,7 +156,6 @@ if [ $? -ne 0 ]; then
exit 1
fi
cd "$top"
-rm -rf ${JKJNIDIST}/jni/xdocs
mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
rm -rf ${JKJNIDIST}/jni/build
for i in LICENSE NOTICE README.txt
@@ -209,7 +208,6 @@ if [ $? -ne 0 ]; then
fi
cd "$top"
-rm -rf ${JKWINDIST}/jni/xdocs
mv ${JKWINDIST}/jni/build/docs ${JKWINDIST}/jni/docs
rm -rf ${JKWINDIST}/jni/build
for i in LICENSE NOTICE README.txt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350220 - /tomcat/native/trunk/jnirelease.sh
Author: rjung
Date: Thu Jun 14 12:54:32 2012
New Revision: 1350220
URL: http://svn.apache.org/viewvc?rev=1350220&view=rev
Log:
Include release script and xdocs in src distribution.
Modified:
tomcat/native/trunk/jnirelease.sh
Modified: tomcat/native/trunk/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=1350220&r1=1350219&r2=1350220&view=diff
==
--- tomcat/native/trunk/jnirelease.sh (original)
+++ tomcat/native/trunk/jnirelease.sh Thu Jun 14 12:54:32 2012
@@ -123,18 +123,11 @@ if [ $? -ne 0 ]; then
exit 1
fi
-# Clean up unused stuff
-for i in jnirelease.sh
-do
-rm -rf ${JKJNIDIST}/${i}
-done
-
top="`pwd`"
cd ${JKJNIDIST}/xdocs
ant
$EXPTOOL $EXPOPTS ../build/docs/miscellaneous/printer/changelog.html >
../CHANGELOG.txt 2>/dev/null
cd "$top"
-rm -rf ${JKJNIDIST}/xdocs
mv ${JKJNIDIST}/build/docs ${JKJNIDIST}/docs
rm -rf ${JKJNIDIST}/build
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350223 - /tomcat/native/branches/1.1.x/README.txt
Author: rjung Date: Thu Jun 14 13:10:04 2012 New Revision: 1350223 URL: http://svn.apache.org/viewvc?rev=1350223&view=rev Log: Improve tcnative README a bit: - typo - fix documentation links - add/fix info on how to run examples Modified: tomcat/native/branches/1.1.x/README.txt Modified: tomcat/native/branches/1.1.x/README.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/README.txt?rev=1350223&r1=1350222&r2=1350223&view=diff == --- tomcat/native/branches/1.1.x/README.txt (original) +++ tomcat/native/branches/1.1.x/README.txt Thu Jun 14 13:10:04 2012 @@ -26,18 +26,23 @@ Documentation - The documentation available as of the date of this release is -included in HTML format in the docs directory. +included in HTML format in the jni/docs directory. The most up-to-date documentation can be found at +http://tomcat.apache.org/native-doc/ + +Documentation about the Tomcat APR connector which is based +on this library can be found at http://tomcat.apache.org/tomcat-7.0-doc/apr.html. -Buliding +Building To build the Java API +> cd jni > ant -To build the native part see native/BUILDING +To build the native part see jni/native/BUILDING Running the examples @@ -45,12 +50,17 @@ Running the examples Before running the examples you may have to set LD_LIBRARY_PATH, something like LD_LIBRARY_PATH=/opt/SMAWoIS/openssl/lib; export LD_LIBRARY_PATH -1 - echo: (port in examples/org/apache/tomcat/jni/Echo.properties). -ant echo-example -2 - ssl server: -(see parameters in ./examples/org/apache/tomcat/jni/SSL.properties) -The certificate and key should be in dist/classes/examples. -ant server-example + +1) echo example: + - Choose some free port in + dist/classes/examples/org/apache/tomcat/jni/Echo.properties + - run: ant run-echo + +2) ssl server example: + - Change parameters in dist/classes/examples/org/apache/tomcat/jni/SSL.properties + according to your needs. The certificate and key should be in + dist/classes/examples. + - run: ant run-ssl-server Cryptographic Software Notice - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350231 - /tomcat/native/branches/1.1.x/TODO.txt
Author: rjung Date: Thu Jun 14 13:28:40 2012 New Revision: 1350231 URL: http://svn.apache.org/viewvc?rev=1350231&view=rev Log: Add a TODO file. Added: tomcat/native/branches/1.1.x/TODO.txt (with props) Added: tomcat/native/branches/1.1.x/TODO.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/TODO.txt?rev=1350231&view=auto == --- tomcat/native/branches/1.1.x/TODO.txt (added) +++ tomcat/native/branches/1.1.x/TODO.txt Thu Jun 14 13:28:40 2012 @@ -0,0 +1,165 @@ + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +Apache Tomcat Native Library + +TODO + + +SSL Renegotiation +- + +It is unclear to me, what the current state is. It looks like we support +the unsafe legacy reneg whenever the OpenSSL used during build time +supports it. There is no configuration option to switch it off during +runtime. Right? + +Is it correct, that client initiated reneg is not supported and thus the +known attacks will not work even with old OpenSSL? + +Should we add a remark about this topic to the docs? + + +Java Tests and Examples +--- + +- No mentioning of running "ant download" before tests. Without + it test compilation fails. + +- "ant test" fails in line 85 of SocketServerTestSuite.java, because + on my system the checking for precisely 2 milliseconds won't work. + The call returns after 11 millis not after 2 + +- "ant run-echo": will fail, because by default uses privileged + port 23. Maybe switch to 8023 as a default? + Users should not run tests as root and on most systems the default + port should just work. + +- "ant run-echo": what is the expected behaviour of this example. + I couldn't get it to do something understandable. + Document the example in the README.txt. + +- "ant run-ssl-server": Could't we include a test certificate in the + distribution? + +- "ant run-ssl-server": What should the test produce, if run successfully? + Document the example in the README.txt. + +- "ant run-local-server": Creates a unix socket "\\.\PIPE\test" in the + examples directory, then waits. How is the test expected to work? + And the file name doesn't seem to be appropriate for Unix. + Document the example in the README.txt. + + +Compilation Warnings + + +On Solaris: + +src/file.c: In function 'Java_org_apache_tomcat_jni_File_writev': +src/file.c:384: warning: pointer targets in assignment differ in signedness +src/file.c:390: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness +src/file.c: In function 'Java_org_apache_tomcat_jni_File_writevFull': +src/file.c:418: warning: pointer targets in assignment differ in signedness +src/file.c:428: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness + +src/network.c: In function 'Java_org_apache_tomcat_jni_Socket_sendv': +src/network.c:668: warning: pointer targets in assignment differ in signedness +src/network.c:674: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness +src/network.c: In function 'Java_org_apache_tomcat_jni_Socket_sendfile': +src/network.c:1220: warning: pointer targets in assignment differ in signedness +src/network.c:1225: warning: pointer targets in assignment differ in signedness +src/network.c:1243: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness +src/network.c:1247: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness + +src/poll.c:271: warning: 'remove_all' defined but not used + +src/ssl.c: In function 'ssl_rand_make':
svn commit: r1350232 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung
Date: Thu Jun 14 13:30:13 2012
New Revision: 1350232
URL: http://svn.apache.org/viewvc?rev=1350232&view=rev
Log:
Add TODO.txt to src distribution.
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1350232&r1=1350231&r2=1350232&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Thu Jun 14 13:30:13 2012
@@ -158,7 +158,7 @@ fi
cd "$top"
mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
rm -rf ${JKJNIDIST}/jni/build
-for i in LICENSE NOTICE README.txt
+for i in LICENSE NOTICE README.txt TODO.txt
do
svn cat ${JKJNISVN}/${i} > ${JKJNIDIST}/${i}
if [ $? -ne 0 ]; then
@@ -210,7 +210,7 @@ cd "$top"
mv ${JKWINDIST}/jni/build/docs ${JKWINDIST}/jni/docs
rm -rf ${JKWINDIST}/jni/build
-for i in LICENSE NOTICE README.txt
+for i in LICENSE NOTICE README.txt TODO.txt
do
svn cat ${JKJNISVN}/${i} > ${JKWINDIST}/${i}
$PERL ${JKWINDIST}/jni/native/build/lineends.pl --cr ${JKWINDIST}/${i}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350235 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Thu Jun 14 13:37:43 2012 New Revision: 1350235 URL: http://svn.apache.org/viewvc?rev=1350235&view=rev Log: Revoke proposal. 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=1350235&r1=1350234&r2=1350235&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jun 14 13:37:43 2012 @@ -52,10 +52,3 @@ PATCHES PROPOSED TO BACKPORT: https://issues.apache.org/bugzilla/attachment.cgi?id=28895 +1: kkolinko, schultz -1: - -* Remove the KEYS file from the src distribution. - It will still be copied to the release directory but not - be contained in the downloaded tar or zip. - http://people.apache.org/~rjung/patches/remove-keys-from-release-tc55.patch - +1: rjung - -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350256 - /tomcat/native/branches/1.1.x/native/src/poll.c
Author: rjung
Date: Thu Jun 14 14:18:40 2012
New Revision: 1350256
URL: http://svn.apache.org/viewvc?rev=1350256&view=rev
Log:
Remove static remove_all() function made
obsolete by r1342025.
Modified:
tomcat/native/branches/1.1.x/native/src/poll.c
Modified: tomcat/native/branches/1.1.x/native/src/poll.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/poll.c?rev=1350256&r1=1350255&r2=1350256&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/poll.c (original)
+++ tomcat/native/branches/1.1.x/native/src/poll.c Thu Jun 14 14:18:40 2012
@@ -267,18 +267,6 @@ static void update_last_active(tcn_polls
}
-static void remove_all(tcn_pollset_t *p)
-{
-apr_int32_t i;
-for (i = 0; i < p->nelts; i++) {
-apr_pollset_remove(p->pollset, &(p->socket_set[i]));
-#ifdef TCN_DO_STATISTICS
-p->sp_removed++;
-#endif
-}
-p->nelts = 0;
-}
-
TCN_IMPLEMENT_CALL(jint, Poll, remove)(TCN_STDARGS, jlong pollset,
jlong socket)
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350270 - /tomcat/native/branches/1.1.x/native/src/ssl.c
Author: rjung Date: Thu Jun 14 14:38:33 2012 New Revision: 1350270 URL: http://svn.apache.org/viewvc?rev=1350270&view=rev Log: Return error if BIO_flush() didn't work. Fixes compiler warning about unused return value. Modified: tomcat/native/branches/1.1.x/native/src/ssl.c Modified: tomcat/native/branches/1.1.x/native/src/ssl.c URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1350270&r1=1350269&r2=1350270&view=diff == --- tomcat/native/branches/1.1.x/native/src/ssl.c (original) +++ tomcat/native/branches/1.1.x/native/src/ssl.c Thu Jun 14 14:38:33 2012 @@ -466,9 +466,9 @@ static int ssl_rand_make(const char *fil BIO_write(out, buf, len); num -= len; } -BIO_flush(out); +r = BIO_flush(out); BIO_free_all(out); -return 1; +return r > 0 ? 1 : 0; } TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350280 - in /tomcat/native/branches/1.1.x/native/src: file.c network.c
Author: rjung
Date: Thu Jun 14 14:54:48 2012
New Revision: 1350280
URL: http://svn.apache.org/viewvc?rev=1350280&view=rev
Log:
Cast pointers to fix compiler warnings about
pointer signedness differences on Solaris.
Modified:
tomcat/native/branches/1.1.x/native/src/file.c
tomcat/native/branches/1.1.x/native/src/network.c
Modified: tomcat/native/branches/1.1.x/native/src/file.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/file.c?rev=1350280&r1=1350279&r2=1350280&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/file.c (original)
+++ tomcat/native/branches/1.1.x/native/src/file.c Thu Jun 14 14:54:48 2012
@@ -381,13 +381,13 @@ TCN_IMPLEMENT_CALL(jint, File, writev)(T
for (i = 0; i < nvec; i++) {
ba[i] = (*e)->GetObjectArrayElement(e, bufs, i);
vec[i].iov_len = (*e)->GetArrayLength(e, ba[i]);
-vec[i].iov_base = (*e)->GetByteArrayElements(e, ba[i], NULL);
+vec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, ba[i], NULL));
}
ss = apr_file_writev(f, vec, nvec, &written);
for (i = 0; i < nvec; i++) {
-(*e)->ReleaseByteArrayElements(e, ba[i], vec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, ba[i], (jbyte *)vec[i].iov_base,
JNI_ABORT);
}
if (ss == APR_SUCCESS)
return (jint)written;
@@ -415,7 +415,7 @@ TCN_IMPLEMENT_CALL(jint, File, writevFul
for (i = 0; i < nvec; i++) {
ba[i] = (*e)->GetObjectArrayElement(e, bufs, i);
vec[i].iov_len = (*e)->GetArrayLength(e, ba[i]);
-vec[i].iov_base = (*e)->GetByteArrayElements(e, ba[i], NULL);
+vec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, ba[i], NULL));
}
#if (APR_VERSION_MAJOR >= 1) && (APR_VERSION_MINOR >= 1)
ss = apr_file_writev_full(f, vec, nvec, &written);
@@ -424,7 +424,7 @@ TCN_IMPLEMENT_CALL(jint, File, writevFul
#endif
for (i = 0; i < nvec; i++) {
-(*e)->ReleaseByteArrayElements(e, ba[i], vec[i].iov_base,
+(*e)->ReleaseByteArrayElements(e, ba[i], (jbyte *)vec[i].iov_base,
JNI_ABORT);
}
if (ss == APR_SUCCESS)
Modified: tomcat/native/branches/1.1.x/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/network.c?rev=1350280&r1=1350279&r2=1350280&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/network.c (original)
+++ tomcat/native/branches/1.1.x/native/src/network.c Thu Jun 14 14:54:48 2012
@@ -665,13 +665,13 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendv)(
for (i = 0; i < nvec; i++) {
ba[i] = (*e)->GetObjectArrayElement(e, bufs, i);
vec[i].iov_len = (*e)->GetArrayLength(e, ba[i]);
-vec[i].iov_base = (*e)->GetByteArrayElements(e, ba[i], NULL);
+vec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, ba[i], NULL));
}
ss = (*s->net->sendv)(s->opaque, vec, nvec, &written);
for (i = 0; i < nvec; i++) {
-(*e)->ReleaseByteArrayElements(e, ba[i], vec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, ba[i], (jbyte*)vec[i].iov_base,
JNI_ABORT);
}
if (ss == APR_SUCCESS)
return (jint)written;
@@ -1217,12 +1217,12 @@ TCN_IMPLEMENT_CALL(jlong, Socket, sendfi
for (i = 0; i < nh; i++) {
hba[i] = (*e)->GetObjectArrayElement(e, headers, i);
hvec[i].iov_len = (*e)->GetArrayLength(e, hba[i]);
-hvec[i].iov_base = (*e)->GetByteArrayElements(e, hba[i], NULL);
+hvec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, hba[i],
NULL));
}
for (i = 0; i < nt; i++) {
tba[i] = (*e)->GetObjectArrayElement(e, trailers, i);
tvec[i].iov_len = (*e)->GetArrayLength(e, tba[i]);
-tvec[i].iov_base = (*e)->GetByteArrayElements(e, tba[i], NULL);
+tvec[i].iov_base = (void *)((*e)->GetByteArrayElements(e, tba[i],
NULL));
}
hdrs.headers = &hvec[0];
hdrs.numheaders = nh;
@@ -1240,11 +1240,11 @@ TCN_IMPLEMENT_CALL(jlong, Socket, sendfi
#endif
for (i = 0; i < nh; i++) {
-(*e)->ReleaseByteArrayElements(e, hba[i], hvec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, hba[i], (jbyte*)hvec[i].iov_base,
JNI_ABORT);
}
for (i = 0; i < nt; i++) {
-(*e)->ReleaseByteArrayElements(e, tba[i], tvec[i].iov_base, JNI_ABORT);
+(*e)->ReleaseByteArrayElements(e, tba[i], (jbyte*)tvec[i].iov_base,
JNI_ABORT);
}
/* Return Number of bytes actually sent,
* including headers, file, and trailers
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350281 - /tomcat/native/branches/1.1.x/TODO.txt
Author: rjung Date: Thu Jun 14 14:55:33 2012 New Revision: 1350281 URL: http://svn.apache.org/viewvc?rev=1350281&view=rev Log: Remove completed items form TODO. Modified: tomcat/native/branches/1.1.x/TODO.txt Modified: tomcat/native/branches/1.1.x/TODO.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/TODO.txt?rev=1350281&r1=1350280&r2=1350281&view=diff == --- tomcat/native/branches/1.1.x/TODO.txt (original) +++ tomcat/native/branches/1.1.x/TODO.txt Thu Jun 14 14:55:33 2012 @@ -66,36 +66,6 @@ Java Tests and Examples Document the example in the README.txt. -Compilation Warnings - - -On Solaris: - -src/file.c: In function 'Java_org_apache_tomcat_jni_File_writev': -src/file.c:384: warning: pointer targets in assignment differ in signedness -src/file.c:390: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness -src/file.c: In function 'Java_org_apache_tomcat_jni_File_writevFull': -src/file.c:418: warning: pointer targets in assignment differ in signedness -src/file.c:428: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness - -src/network.c: In function 'Java_org_apache_tomcat_jni_Socket_sendv': -src/network.c:668: warning: pointer targets in assignment differ in signedness -src/network.c:674: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness -src/network.c: In function 'Java_org_apache_tomcat_jni_Socket_sendfile': -src/network.c:1220: warning: pointer targets in assignment differ in signedness -src/network.c:1225: warning: pointer targets in assignment differ in signedness -src/network.c:1243: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness -src/network.c:1247: warning: pointer targets in passing argument 3 of '(*e)->ReleaseByteArrayElements' differ in signedness - -src/poll.c:271: warning: 'remove_all' defined but not used - -src/ssl.c: In function 'ssl_rand_make': -src/ssl.c:469: warning: value computed is not used - -Some info on that: "The JNI functions take a jbyte*, which is a signed char* -on my Solaris system. Whereas the iovec iov_base is a caddr_t, which is a char*." - - Java Classes Source Distribution - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350339 - in /tomcat/native/branches/1.1.x: native/os/unix/system.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Thu Jun 14 17:04:14 2012
New Revision: 1350339
URL: http://svn.apache.org/viewvc?rev=1350339&view=rev
Log:
Add CPU information to OS info for Linux.
This was already available under Windows and Solaris.
Modified:
tomcat/native/branches/1.1.x/native/os/unix/system.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/branches/1.1.x/native/os/unix/system.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/unix/system.c?rev=1350339&r1=1350338&r2=1350339&view=diff
==
--- tomcat/native/branches/1.1.x/native/os/unix/system.c (original)
+++ tomcat/native/branches/1.1.x/native/os/unix/system.c Thu Jun 14 17:04:14
2012
@@ -127,6 +127,15 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
if (sysinfo(&info))
rv = apr_get_os_error();
else {
+static char buf[1024];
+unsigned long user = 0;
+unsigned long system = 0;
+long idle = 0;
+long long starttime = 0;
+int fd;
+int len;
+long sys_clk_tck = sysconf(_SC_CLK_TCK); /* number of system ticks
per second */
+
pvals[0] = (jlong)(info.totalram * info.mem_unit);
pvals[1] = (jlong)(info.freeram * info.mem_unit);
pvals[2] = (jlong)(info.totalswap * info.mem_unit);
@@ -134,6 +143,54 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
pvals[4] = (jlong)(info.sharedram * info.mem_unit);
pvals[5] = (jlong)(info.bufferram * info.mem_unit);
pvals[6] = (jlong)(100 - (info.freeram * 100 / info.totalram));
+
+if (sys_clk_tck >= 0) {
+/* Get total CPU times from /proc/stat */
+/* Example for the first line: cpu 2095497 8176 3280198
908667841 1543576 28867 375399 0 0 */
+/* Accoring to the man pages, the numbers are given in units
of USER_HZ:
+ * user mode, user mode with low priority (nice), system mode,
and the idle task.
+ * Additional values can be ignored. */
+fd = open("/proc/stat", O_RDONLY);
+if (fd != -1) {
+len = read(fd, buf, sizeof buf - 1);
+if (len > 0) {
+buf[len] = '\0';
+if (sscanf(buf, "cpu %lu %*d %lu %ld", &user, &system,
&idle) == 3) {
+pvals[7] = (jlong)(idle * 1000 / sys_clk_tck *
1000); /* Idle Time in microseconds */
+pvals[8] = (jlong)(system * 1000 / sys_clk_tck *
1000); /* Kernel Time in microseconds */
+pvals[9] = (jlong)(user * 1000 / sys_clk_tck *
1000); /* User Time in microseconds */
+}
+}
+close(fd);
+}
+/* Get process CPU times from /proc/self/stat */
+/* Example for the first line:
+ * 6309 (csh) S 6308 6309 6309 34816 7124 4202496 15119 252261
1 30 21 58 1537 1447 20 0 1 0 916031966 ... */
+/* Parsing it according to man -s 5 proci:
+ * pid %d, comm %s, state %c, ppid %d pgrp %d, session %d,
tty_nr %d, tpgid %d, flags %u,
+ * minflt %lu, cminflt %lu, majflt %lu, cmajflt %lu,
+ * utime %lu (!), stime %lu (!), cutime %ld (!), cstime %ld
(!),
+ * priority %ld, nice %ld, num_threads %ld, itrealvalue %ld,
+ * starttime %llu (!) */
+fd = open("/proc/self/stat", O_RDONLY);
+if (fd != -1) {
+len = read(fd, buf, sizeof buf - 1);
+if (len > 0) {
+buf[len] = '\0';
+if (sscanf(buf, "%*d %*s %*c %*d %*d %*d %*d %*d %*u"
+" %*u %*u %*u %*u"
+" %lu %lu %*d %*d"
+" %*d %*d %*d %*d"
+"%llu", &user, &system, &starttime) ==
3) {
+pvals[10] = (jlong)(apr_time_now() -
apr_time_make(info.uptime - starttime / sys_clk_tck, 0)); /* Process creation
time (apr_time_t) */
+pvals[11] = (jlong)(system * 1000 / sys_clk_tck *
1000); /* Process System Time in microseconds */
+pvals[12] = (jlong)(user * 1000 / sys_clk_tck *
1000); /* Process User Time in microseconds */
+}
+}
+close(fd);
+}
+}
+
rv = APR_SUCCESS;
}
}
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneo
svn commit: r1350340 - /tomcat/native/branches/1.1.x/TODO.txt
Author: rjung Date: Thu Jun 14 17:05:15 2012 New Revision: 1350340 URL: http://svn.apache.org/viewvc?rev=1350340&view=rev Log: CPU OS info for Linux done. More testing under different distros appreciated. Implementation based on proc file system. Modified: tomcat/native/branches/1.1.x/TODO.txt Modified: tomcat/native/branches/1.1.x/TODO.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/TODO.txt?rev=1350340&r1=1350339&r2=1350340&view=diff == --- tomcat/native/branches/1.1.x/TODO.txt (original) +++ tomcat/native/branches/1.1.x/TODO.txt Thu Jun 14 17:05:15 2012 @@ -85,23 +85,6 @@ Furthermore some of the old files do not I don't know their purpose and whether we can delete them. -Incomplete implementation on Linux --- - -There is no impl for Linux to retrieve - - * inf[7] - Idle Time in microseconds - * inf[8] - Kernel Time in microseconds - * inf[9] - User Time in microseconds - * inf[10] - Process creation time (apr_time_t) - * inf[11] - Process Kernel Time in microseconds - * inf[12] - Process User Time in microseconds - -I implemented those for Solaris long ago and thought they existed for -Linux from the beginning. But in fact for Linux there are only memory -figures implemented. - - Releasing - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350864 - /tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Author: rjung
Date: Sat Jun 16 06:22:00 2012
New Revision: 1350864
URL: http://svn.apache.org/viewvc?rev=1350864&view=rev
Log:
Fix checking recommended tcnative version.
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=1350864&r1=1350863&r2=1350864&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Sat
Jun 16 06:22:00 2012
@@ -161,7 +161,7 @@ public class AprLifecycleListener
int patch = 0;
int apver = 0;
int rqver = TCN_REQUIRED_MAJOR * 1000 + TCN_REQUIRED_MINOR * 100 +
TCN_REQUIRED_PATCH;
-int rcver = TCN_REQUIRED_MAJOR * 1000 + TCN_REQUIRED_MINOR * 100 +
TCN_RECOMMENDED_PV;
+int rcver = TCN_REQUIRED_MAJOR * 1000 + TCN_RECOMMENDED_MINOR * 100 +
TCN_RECOMMENDED_PV;
if (aprInitialized) {
return;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1350865 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: rjung
Date: Sat Jun 16 06:28:02 2012
New Revision: 1350865
URL: http://svn.apache.org/viewvc?rev=1350865&view=rev
Log:
Fix checking recommended tcnative version.
Backport of r1350864 from trunk.
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
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1350864
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=1350865&r1=1350864&r2=1350865&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
Sat Jun 16 06:28:02 2012
@@ -161,7 +161,7 @@ public class AprLifecycleListener
int patch = 0;
int apver = 0;
int rqver = TCN_REQUIRED_MAJOR * 1000 + TCN_REQUIRED_MINOR * 100 +
TCN_REQUIRED_PATCH;
-int rcver = TCN_REQUIRED_MAJOR * 1000 + TCN_REQUIRED_MINOR * 100 +
TCN_RECOMMENDED_PV;
+int rcver = TCN_REQUIRED_MAJOR * 1000 + TCN_RECOMMENDED_MINOR * 100 +
TCN_RECOMMENDED_PV;
if (aprInitialized) {
return;
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=1350865&r1=1350864&r2=1350865&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Jun 16 06:28:02 2012
@@ -53,6 +53,14 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+
+
+
+Fix checking of recommended tcnative library version
+ when using the APR connector. (rjung)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361263 - in /tomcat/trunk/java/org/apache: catalina/valves/LocalStrings.properties tomcat/util/http/res/LocalStrings.properties
Author: rjung
Date: Fri Jul 13 15:09:20 2012
New Revision: 1361263
URL: http://svn.apache.org/viewvc?rev=1361263&view=rev
Log:
Update list of HTTP status codes.
Current list taken from
http://www.iana.org/assignments/http-status-codes/http-status-codes.xml.
Only change of existing entries is code 302 message text changed
from "Moved Temporarily" to "Found" as per RFC 2616.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1361263&r1=1361262&r2=1361263&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties Fri
Jul 13 15:09:20 2012
@@ -51,8 +51,13 @@ stuckThreadDetectionValve.notifyStuckThr
stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread "{0}" (id={3}) was
previously reported to be stuck but has completed. It was active for
approximately {1} milliseconds.{2,choice,0#|0< There is/are still {2} thread(s)
that are monitored by this Valve and may be stuck.}
# HTTP status reports
+# All status codes registered with IANA can be found at
+# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
+# The list might be kept in sync with the one in
+# org/apache/tomcat/util/http/res/LocalStrings.properties.
http.100=The client may continue ({0}).
http.101=The server is switching protocols according to the "Upgrade" header
({0}).
+http.102=The server has accepted the complete request, but has not yet
completed it ({0}).
http.201=The request succeeded and a new resource ({0}) has been created on
the server.
http.202=This request was accepted for processing, but has not been completed
({0}).
http.203=The meta information presented by the client did not originate from
the server ({0}).
@@ -60,12 +65,16 @@ http.204=The request succeeded but there
http.205=The client should reset the document view which caused this request
to be sent ({0}).
http.206=The server has fulfilled a partial GET request for this resource
({0}).
http.207=Multiple status values have been returned ({0}).
+http.208=This collection binding was already reported ({0}).
+http.226=The response is a representation of the result of one or more
instance-manipulations applied to the current instance ({0}).
http.300=The requested resource ({0}) corresponds to any one of a set of
representations, each with its own specific location.
http.301=The requested resource ({0}) has moved permanently to a new location.
http.302=The requested resource ({0}) has moved temporarily to a new location.
http.303=The response to this request can be found under a different URI ({0}).
http.304=The requested resource ({0}) is available and has not been modified.
http.305=The requested resource ({0}) must be accessed through the proxy given
by the "Location" header.
+http.307=The requested resource resides temporarily under a different URI
({0}).
+http.308=The target resource has been assigned a new permanent URI and any
future references to this resource SHOULD use one of the returned URIs ({0}).
http.400=The request sent by the client was syntactically incorrect ({0}).
http.401=This request requires HTTP authentication ({0}).
http.402=Payment is required for access to this resource ({0}).
@@ -86,10 +95,19 @@ http.416=The requested byte range cannot
http.417=The expectation given in the "Expect" request header ({0}) could not
be fulfilled.
http.422=The server understood the content type and syntax of the request but
was unable to process the contained instructions ({0}).
http.423=The source or destination resource of a method is locked ({0}).
+http.424=The method could not be performed on the resource because the
requested action depended on another action and that action failed ({0}).
+http.426=The request can only be completed after a protocol upgrade ({0}).
+http.428=The request is required to be conditional ({0}).
+http.429=The user has sent too many requests in a given amount of time ({0}).
+http.431=The server refused this request because the request header fields are
too large ({0}).
http.500=The server encountered an internal error ({0}) that prevented it from
fulfilling this request.
http.501=The server does not support the functionality needed to fulfill this
request ({0}).
http.502=This server received an invalid response from a server it consulted
when acting as a proxy or gateway ({0}).
http.503=The requested service ({0}) is not currently available.
http.504=The server received a timeout from an upstream server while acting as
svn commit: r1361962 - /tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties
Author: rjung Date: Mon Jul 16 10:00:21 2012 New Revision: 1361962 URL: http://svn.apache.org/viewvc?rev=1361962&view=rev Log: Remove redundant Japanese message texts. Since they were all english they can be found in LocalString.properties. Keep Japanese file because of the information contained in the comments. Modified: tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties Modified: tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties?rev=1361962&r1=1361961&r2=1361962&view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties Mon Jul 16 10:00:21 2012 @@ -14,50 +14,6 @@ # limitations under the License. # HttpMessages. The values in this file will be used in HTTP headers and as such -# may only contain TEXT as defined by RFC 2616. Since Japanese language messages -# do not meet this requirement, English text is used. -sc.100=Continue -sc.101=Switching Protocols -sc.200=OK -sc.201=Created -sc.202=Accepted -sc.203=Non-Authoritative Information -sc.204=No Content -sc.205=Reset Content -sc.206=Partial Content -sc.207=Multi-Status -sc.300=Multiple Choices -sc.301=Moved Permanently -sc.302=Moved Temporarily -sc.303=See Other -sc.304=Not Modified -sc.305=Use Proxy -sc.307=Temporary Redirect -sc.400=Bad Request -sc.401=Unauthorized -sc.402=Payment Required -sc.403=Forbidden -sc.404=Not Found -sc.405=Method Not Allowed -sc.406=Not Acceptable -sc.407=Proxy Authentication Required -sc.408=Request Timeout -sc.409=Conflict -sc.410=Gone -sc.411=Length Required -sc.412=Precondition Failed -sc.413=Request Entity Too Large -sc.414=Request-URI Too Long -sc.415=Unsupported Media Type -sc.416=Requested Range Not Satisfiable -sc.417=Expectation Failed -sc.422=Unprocessable Entity -sc.423=Locked -sc.424=Failed Dependency -sc.500=Internal Server Error -sc.501=Not Implemented -sc.502=Bad Gateway -sc.503=Service Unavailable -sc.504=Gateway Timeout -sc.505=HTTP Version Not Supported -sc.507=Insufficient Storage +# may only contain TEXT as defined by RFC 2616. Since Japanese language +# messages do not meet this requirement, English text is used. +# The English messages can be found in the default file LocalStrings.properties. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361981 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoader.java modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/src/test/java/org/apache/
Author: rjung
Date: Mon Jul 16 12:00:25 2012
New Revision: 1361981
URL: http://svn.apache.org/viewvc?rev=1361981&view=rev
Log:
Revert r1361432: method is not unused.
WebappLoader uses it via reflection.
Note: the spurious remove of svn:mergeinfo from
jdbc doesn't harm, it was empty.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
(props changed)
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
(props changed)
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361981&r1=1361980&r2=1361981&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Jul
16 12:00:25 2012
@@ -236,8 +236,33 @@ public class WebappClassLoader
}
+/**
+ * Construct a new ClassLoader with no defined repositories and the given
+ * parent ClassLoader.
+ *
+ * @param parent Our parent class loader
+ *
+ * @deprecated Unused - will be removed in 8.0.x
+ */
+@Deprecated
+public WebappClassLoader(ClassLoader parent) {
+
+super(new URL[0], parent);
+
+this.parent = getParent();
+
+system = getSystemClassLoader();
+securityManager = System.getSecurityManager();
+
+if (securityManager != null) {
+refreshPolicy();
+}
+}
+
+
// - Instance Variables
+
/**
* Associated directory context giving access to the resources in this
* webapp.
Propchange:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/
('svn:mergeinfo' removed)
Propchange:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/
('svn:mergeinfo' removed)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361982 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: rjung
Date: Mon Jul 16 12:01:46 2012
New Revision: 1361982
URL: http://svn.apache.org/viewvc?rev=1361982&view=rev
Log:
Revert r1361430: the method can not be deprecated,
because it is still used by WebappLoader via reflection.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361982&r1=1361981&r2=1361982&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Jul
16 12:01:46 2012
@@ -241,10 +241,7 @@ public class WebappClassLoader
* parent ClassLoader.
*
* @param parent Our parent class loader
- *
- * @deprecated Unused - will be removed in 8.0.x
*/
-@Deprecated
public WebappClassLoader(ClassLoader parent) {
super(new URL[0], parent);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361985 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: rjung
Date: Mon Jul 16 12:12:10 2012
New Revision: 1361985
URL: http://svn.apache.org/viewvc?rev=1361985&view=rev
Log:
Add javadoc to clarify method use.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361985&r1=1361984&r2=1361985&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Jul
16 12:12:10 2012
@@ -239,6 +239,9 @@ public class WebappClassLoader
/**
* Construct a new ClassLoader with no defined repositories and the given
* parent ClassLoader.
+ *
+ * Method is used via reflection -
+ * see {@link WebappLoader#createClassLoader()}
*
* @param parent Our parent class loader
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361987 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/WebappClassLoader.java
Author: rjung
Date: Mon Jul 16 12:20:10 2012
New Revision: 1361987
URL: http://svn.apache.org/viewvc?rev=1361987&view=rev
Log:
Revert r1361434: method is not deprecated.
Add javadoc to clarify method use.
Backport of r1361982 and r1361985 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1361982,1361985
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1361987&r1=1361986&r2=1361987&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Mon Jul 16 12:20:10 2012
@@ -240,12 +240,12 @@ public class WebappClassLoader
/**
* Construct a new ClassLoader with no defined repositories and the given
* parent ClassLoader.
+ *
+ * Method is used via reflection -
+ * see {@link WebappLoader#createClassLoader()}
*
* @param parent Our parent class loader
- *
- * @deprecated Unused - will be removed in 8.0.x
*/
-@Deprecated
public WebappClassLoader(ClassLoader parent) {
super(new URL[0], parent);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1361991 - in /tomcat/trunk/java/org/apache/catalina/valves: ErrorReportValve.java LocalStrings.properties LocalStrings_es.properties LocalStrings_fr.properties
Author: rjung
Date: Mon Jul 16 12:26:41 2012
New Revision: 1361991
URL: http://svn.apache.org/viewvc?rev=1361991&view=rev
Log:
Remove redundant output of error message from
error report.
See: https://issues.apache.org/bugzilla/show_bug.cgi?id=53071#c9
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1361991&r1=1361990&r2=1361991&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon Jul
16 12:26:41 2012
@@ -152,7 +152,7 @@ public class ErrorReportValve extends Va
// Do nothing if there is no report for the specified status code
String report = null;
try {
-report = sm.getString("http." + statusCode, message);
+report = sm.getString("http." + statusCode);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1361991&r1=1361990&r2=1361991&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties Mon
Jul 16 12:26:41 2012
@@ -55,59 +55,59 @@ stuckThreadDetectionValve.notifyStuckThr
# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
# The list might be kept in sync with the one in
# org/apache/tomcat/util/http/res/LocalStrings.properties.
-http.100=The client may continue ({0}).
-http.101=The server is switching protocols according to the "Upgrade" header
({0}).
-http.102=The server has accepted the complete request, but has not yet
completed it ({0}).
-http.201=The request succeeded and a new resource ({0}) has been created on
the server.
-http.202=This request was accepted for processing, but has not been completed
({0}).
-http.203=The meta information presented by the client did not originate from
the server ({0}).
-http.204=The request succeeded but there is no information to return ({0}).
-http.205=The client should reset the document view which caused this request
to be sent ({0}).
-http.206=The server has fulfilled a partial GET request for this resource
({0}).
-http.207=Multiple status values have been returned ({0}).
-http.208=This collection binding was already reported ({0}).
-http.226=The response is a representation of the result of one or more
instance-manipulations applied to the current instance ({0}).
-http.300=The requested resource ({0}) corresponds to any one of a set of
representations, each with its own specific location.
-http.301=The requested resource ({0}) has moved permanently to a new location.
-http.302=The requested resource ({0}) has moved temporarily to a new location.
-http.303=The response to this request can be found under a different URI ({0}).
-http.304=The requested resource ({0}) is available and has not been modified.
-http.305=The requested resource ({0}) must be accessed through the proxy given
by the "Location" header.
-http.307=The requested resource resides temporarily under a different URI
({0}).
-http.308=The target resource has been assigned a new permanent URI and any
future references to this resource SHOULD use one of the returned URIs ({0}).
-http.400=The request sent by the client was syntactically incorrect ({0}).
-http.401=This request requires HTTP authentication ({0}).
-http.402=Payment is required for access to this resource ({0}).
-http.403=Access to the specified resource ({0}) has been forbidden.
-http.404=The requested resource ({0}) is not available.
-http.405=The specified HTTP method is not allowed for the requested resource
({0}).
-http.406=The resource identified by this request is only capable of generating
responses with characteristics not acceptable according to the request "accept"
headers ({0}).
-http.407=The client must first authenticate itself with the proxy ({0}).
-http.408=The client did not produce a request within the time that the server
was prepared to wait ({0}).
-http.409=The request could not be completed due to a conflict with the current
state of the resource ({0}).
-http.410=The requested resource ({0}) is no longer av
svn commit: r1361998 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ java/org/apache/tomcat/util/http/res/ webapps/docs/
Author: rjung
Date: Mon Jul 16 12:32:24 2012
New Revision: 1361998
URL: http://svn.apache.org/viewvc?rev=1361998&view=rev
Log:
- Update list of HTTP status codes.
Current list taken from
http://www.iana.org/assignments/http-status-codes/http-status-codes.xml.
Only change of existing entries is code 302 message text changed
from "Moved Temporarily" to "Found" as per RFC 2616.
Backport of r1361263 from trunk.
- Remove redundant Japanese message texts.
Since they were all english they can be found
in LocalString.properties.
Keep Japanese file because of the information
contained in the comments.
Backport of r1361962 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1361263,1361962
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1361998&r1=1361997&r2=1361998&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Mon Jul 16 12:32:24 2012
@@ -56,8 +56,13 @@ stuckThreadDetectionValve.notifyStuckThr
stuckThreadDetectionValve.notifyStuckThreadCompleted=Thread "{0}" (id={3}) was
previously reported to be stuck but has completed. It was active for
approximately {1} milliseconds.{2,choice,0#|0< There is/are still {2} thread(s)
that are monitored by this Valve and may be stuck.}
# HTTP status reports
+# All status codes registered with IANA can be found at
+# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
+# The list might be kept in sync with the one in
+# org/apache/tomcat/util/http/res/LocalStrings.properties.
http.100=The client may continue ({0}).
http.101=The server is switching protocols according to the "Upgrade" header
({0}).
+http.102=The server has accepted the complete request, but has not yet
completed it ({0}).
http.201=The request succeeded and a new resource ({0}) has been created on
the server.
http.202=This request was accepted for processing, but has not been completed
({0}).
http.203=The meta information presented by the client did not originate from
the server ({0}).
@@ -65,12 +70,16 @@ http.204=The request succeeded but there
http.205=The client should reset the document view which caused this request
to be sent ({0}).
http.206=The server has fulfilled a partial GET request for this resource
({0}).
http.207=Multiple status values have been returned ({0}).
+http.208=This collection binding was already reported ({0}).
+http.226=The response is a representation of the result of one or more
instance-manipulations applied to the current instance ({0}).
http.300=The requested resource ({0}) corresponds to any one of a set of
representations, each with its own specific location.
http.301=The requested resource ({0}) has moved permanently to a new location.
http.302=The requested resource ({0}) has moved temporarily to a new location.
http.303=The response to this request can be found under a different URI ({0}).
http.304=The requested resource ({0}) is available and has not been modified.
http.305=The requested resource ({0}) must be accessed through the proxy given
by the "Location" header.
+http.307=The requested resource resides temporarily under a different URI
({0}).
+http.308=The target resource has been assigned a new permanent URI and any
future references to this resource SHOULD use one of the returned URIs ({0}).
http.400=The request sent by the client was syntactically incorrect ({0}).
http.401=This request requires HTTP authentication ({0}).
http.402=Payment is required for access to this resource ({0}).
@@ -91,10 +100,19 @@ http.416=The requested byte range cannot
http.417=The expectation given in the "Expect" request header ({0}) could not
be fulfilled.
http.422=The server understood the content type and syntax of the request but
was unable to process the contained instructions ({0}).
http.423=The source or destination resource of a method is locked ({0}).
+http.424=The method could not be performed on the resource because the
requested action depended on another action and that action failed ({0}).
+http.426=The request can only be completed after a protocol upgrade ({0}).
+http.428=The request is required to be condit
svn commit: r1362000 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/
Author: rjung
Date: Mon Jul 16 12:34:22 2012
New Revision: 1362000
URL: http://svn.apache.org/viewvc?rev=1362000&view=rev
Log:
Remove redundant output of error message from
error report.
See: https://issues.apache.org/bugzilla/show_bug.cgi?id=53071#c9
Backport of r1361991 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1361991
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1362000&r1=1361999&r2=1362000&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
Mon Jul 16 12:34:22 2012
@@ -176,7 +176,7 @@ public class ErrorReportValve extends Va
// Do nothing if there is no report for the specified status code
String report = null;
try {
-report = sm.getString("http." + statusCode, message);
+report = sm.getString("http." + statusCode);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1362000&r1=1361999&r2=1362000&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Mon Jul 16 12:34:22 2012
@@ -60,59 +60,59 @@ stuckThreadDetectionValve.notifyStuckThr
# http://www.iana.org/assignments/http-status-codes/http-status-codes.xml
# The list might be kept in sync with the one in
# org/apache/tomcat/util/http/res/LocalStrings.properties.
-http.100=The client may continue ({0}).
-http.101=The server is switching protocols according to the "Upgrade" header
({0}).
-http.102=The server has accepted the complete request, but has not yet
completed it ({0}).
-http.201=The request succeeded and a new resource ({0}) has been created on
the server.
-http.202=This request was accepted for processing, but has not been completed
({0}).
-http.203=The meta information presented by the client did not originate from
the server ({0}).
-http.204=The request succeeded but there is no information to return ({0}).
-http.205=The client should reset the document view which caused this request
to be sent ({0}).
-http.206=The server has fulfilled a partial GET request for this resource
({0}).
-http.207=Multiple status values have been returned ({0}).
-http.208=This collection binding was already reported ({0}).
-http.226=The response is a representation of the result of one or more
instance-manipulations applied to the current instance ({0}).
-http.300=The requested resource ({0}) corresponds to any one of a set of
representations, each with its own specific location.
-http.301=The requested resource ({0}) has moved permanently to a new location.
-http.302=The requested resource ({0}) has moved temporarily to a new location.
-http.303=The response to this request can be found under a different URI ({0}).
-http.304=The requested resource ({0}) is available and has not been modified.
-http.305=The requested resource ({0}) must be accessed through the proxy given
by the "Location" header.
-http.307=The requested resource resides temporarily under a different URI
({0}).
-http.308=The target resource has been assigned a new permanent URI and any
future references to this resource SHOULD use one of the returned URIs ({0}).
-http.400=The request sent by the client was syntactically incorrect ({0}).
-http.401=This request requires HTTP authentication ({0}).
-http.402=Payment is required for access to this resource ({0}).
-http.403=Access to the specified resource ({0}) has been forbidden.
-http.404=The requested resource ({0}) is not available.
-http.405=The specified HTTP method is not allowed for the requested resource
({0}).
-http.406=The resource identified by this request is only capable of generating
responses with characteristics not acceptable according to the request "accept"
headers ({0}).
-http.407=The client mus
svn commit: r1366354 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Fri Jul 27 12:12:02 2012 New Revision: 1366354 URL: http://svn.apache.org/viewvc?rev=1366354&view=rev Log: Vote, promote. 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=1366354&r1=1366353&r2=1366354&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 27 12:12:02 2012 @@ -28,6 +28,20 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT: [ start all new proposals below, under PATCHES PROPOSED. ] +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53531 + ExpandWar.expand does not check the return value of File.mkdirs + Patch here: https://issues.apache.org/bugzilla/attachment.cgi?id=29050 + This is a similar fix to trunk (http://svn.apache.org/viewvc?view=revision&revision=1359981) + and also includes checking of File.mkdirs() as mentioned in the bug. + +1: schultz, kkolinko, rjung + -1: + +* Fix conflict with CSRF protection filter and clustering + Cache needs to be serializable + http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?r1=1083987&r2=1083986&pathrev=1083987 + +1: markt, kkolinko, rjung + -1: + PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] @@ -144,20 +158,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kfujino -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53531 - ExpandWar.expand does not check the return value of File.mkdirs - Patch here: https://issues.apache.org/bugzilla/attachment.cgi?id=29050 - This is a similar fix to trunk (http://svn.apache.org/viewvc?view=revision&revision=1359981) - and also includes checking of File.mkdirs() as mentioned in the bug. - +1: schultz, kkolinko - -1: - -* Fix conflict with CSRF protection filter and clustering - Cache needs to be serializable - http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?r1=1083987&r2=1083986&pathrev=1083987 - +1: markt, kkolinko - -1: - PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1372196 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Sun Aug 12 20:56:10 2012 New Revision: 1372196 URL: http://svn.apache.org/viewvc?rev=1372196&view=rev Log: Vote, comment. 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=1372196&r1=1372195&r2=1372196&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Aug 12 20:56:10 2012 @@ -170,8 +170,11 @@ PATCHES PROPOSED TO BACKPORT: - Trim Jasper error messages http://svn.apache.org/viewvc?view=revision&revision=1361991 http://svn.apache.org/viewvc?rev=1372131&view=rev - +1: markt + +1: markt, rjung -1: + rjung: 1361991 doesn't apply cleanly, because the list of status codes + was extended in 1361263 and 1361962. + I would be +1 to backport those two as well. 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: r1401472 - /tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
Author: rjung Date: Tue Oct 23 21:00:19 2012 New Revision: 1401472 URL: http://svn.apache.org/viewvc?rev=1401472&view=rev Log: Fix NPE in unconfigured VirtualWebappLoader. StringTokenizer throws the NPE if the virtualClassPath wasn't explicitely configured (null by default). This might not be observed in the wild because a VirtualWebappLoader without a configured virtualClassPath isn't expected. But if you extend the class and add features, then this might well happen. Modified: tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java Modified: tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?rev=1401472&r1=1401471&r2=1401472&view=diff == --- tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java Tue Oct 23 21:00:19 2012 @@ -57,7 +57,7 @@ public class VirtualWebappLoader extends /** * ; separated list of additional path elements. */ -private String virtualClasspath; +private String virtualClasspath = ""; /** * Construct a new WebappLoader with no defined parent class loader (so that - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1401477 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/VirtualWebappLoader.java
Author: rjung Date: Tue Oct 23 21:04:54 2012 New Revision: 1401477 URL: http://svn.apache.org/viewvc?rev=1401477&view=rev Log: Fix NPE in unconfigured VirtualWebappLoader. StringTokenizer throws the NPE if the virtualClassPath wasn't explicitely configured (null by default). This might not be observed in the wild because a VirtualWebappLoader without a configured virtualClassPath isn't expected. But if you extend the class and add features, then this might well happen. Backport of r1401472 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1401472 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?rev=1401477&r1=1401476&r2=1401477&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java Tue Oct 23 21:04:54 2012 @@ -57,7 +57,7 @@ public class VirtualWebappLoader extends /** * ; separated list of additional path elements. */ -private String virtualClasspath; +private String virtualClasspath = ""; /** * Construct a new WebappLoader with no defined parent class loader (so that - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1410752 - in /tomcat/trunk: java/org/apache/catalina/mapper/Mapper.java test/org/apache/catalina/mapper/TestMapper.java
Author: rjung
Date: Sat Nov 17 17:12:18 2012
New Revision: 1410752
URL: http://svn.apache.org/viewvc?rev=1410752&view=rev
Log:
Type-Safety for the Mapper - Part 1.
Rename inner classes Host, Context and Wrapper
to MappedHost, MappedContext and MappedWrapper.
Modified:
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java
Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1410752&r1=1410751&r2=1410752&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Sat Nov 17
17:12:18 2012
@@ -47,7 +47,7 @@ public final class Mapper {
/**
* Array containing the virtual hosts definitions.
*/
-protected Host[] hosts = new Host[0];
+protected MappedHost[] hosts = new MappedHost[0];
/**
@@ -83,8 +83,8 @@ public final class Mapper {
*/
public synchronized void addHost(String name, String[] aliases,
Object host) {
-Host[] newHosts = new Host[hosts.length + 1];
-Host newHost = new Host();
+MappedHost[] newHosts = new MappedHost[hosts.length + 1];
+MappedHost newHost = new MappedHost();
ContextList contextList = new ContextList();
newHost.name = name;
newHost.contextList = contextList;
@@ -93,8 +93,8 @@ public final class Mapper {
hosts = newHosts;
}
for (int i = 0; i < aliases.length; i++) {
-newHosts = new Host[hosts.length + 1];
-newHost = new Host();
+newHosts = new MappedHost[hosts.length + 1];
+newHost = new MappedHost();
newHost.name = aliases[i];
newHost.contextList = contextList;
newHost.object = host;
@@ -117,14 +117,14 @@ public final class Mapper {
return;
}
Object host = hosts[pos].object;
-Host[] newHosts = new Host[hosts.length - 1];
+MappedHost[] newHosts = new MappedHost[hosts.length - 1];
if (removeMap(hosts, newHosts, name)) {
hosts = newHosts;
}
// Remove all aliases (they will map to the same host object)
for (int i = 0; i < newHosts.length; i++) {
if (newHosts[i].object == host) {
-Host[] newHosts2 = new Host[hosts.length - 1];
+MappedHost[] newHosts2 = new MappedHost[hosts.length - 1];
if (removeMap(hosts, newHosts2, newHosts[i].name)) {
hosts = newHosts2;
}
@@ -144,10 +144,10 @@ public final class Mapper {
// just in case...
return;
}
-Host realHost = hosts[pos];
+MappedHost realHost = hosts[pos];
-Host[] newHosts = new Host[hosts.length + 1];
-Host newHost = new Host();
+MappedHost[] newHosts = new MappedHost[hosts.length + 1];
+MappedHost newHost = new MappedHost();
newHost.name = alias;
newHost.contextList = realHost.contextList;
newHost.object = realHost.object;
@@ -166,7 +166,7 @@ public final class Mapper {
if (pos < 0) {
return;
}
-Host[] newHosts = new Host[hosts.length - 1];
+MappedHost[] newHosts = new MappedHost[hosts.length - 1];
if (removeMap(hosts, newHosts, alias)) {
hosts = newHosts;
}
@@ -189,7 +189,7 @@ public final class Mapper {
String version, Object context, String[] welcomeResources,
WebResourceRoot resources) {
-Host[] hosts = this.hosts;
+MappedHost[] hosts = this.hosts;
int pos = find(hosts, hostName);
if( pos <0 ) {
addHost(hostName, new String[0], host);
@@ -199,27 +199,27 @@ public final class Mapper {
if (pos < 0) {
log.error("No host found: " + hostName);
}
-Host mappedHost = hosts[pos];
+MappedHost mappedHost = hosts[pos];
if (mappedHost.name.equals(hostName)) {
int slashCount = slashCount(path);
synchronized (mappedHost) {
-Context[] contexts = mappedHost.contextList.contexts;
+MappedContext[] contexts = mappedHost.contextList.contexts;
// Update nesting
if (slashCount > mappedHost.contextList.nesting) {
mappedHost.contextList.nesting = slashCount;
}
int pos2 = find(contexts, path);
if (pos2 < 0 || !path.equals(contexts[pos2].name)) {
-Context newContext = new Context();
+MappedContext newContext = new Mapped
svn commit: r1410763 - /tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
Author: rjung
Date: Sat Nov 17 19:25:18 2012
New Revision: 1410763
URL: http://svn.apache.org/viewvc?rev=1410763&view=rev
Log:
Fix time zone formatting in ALV test.
Test failed in non-GMT time zone.
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
Modified: tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java?rev=1410763&r1=1410762&r2=1410763&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java Sat
Nov 17 19:25:18 2012
@@ -34,7 +34,7 @@ public class TestAccessLogValve {
final int cacheSize = 10;
SimpleDateFormat sdf =
-new SimpleDateFormat("dd/MMM/:HH:mm:ss", Locale.US);
+new SimpleDateFormat("[dd/MMM/:HH:mm:ss Z]", Locale.US);
sdf.setTimeZone(TimeZone.getDefault());
AccessLogValve.DateFormatCache dfc =
@@ -89,6 +89,7 @@ public class TestAccessLogValve {
}
private String generateExpected(SimpleDateFormat sdf, long secs) {
-return "[" + sdf.format(new Date(secs * 1000)) + " +]";
+System.out.println("generateExpected: " + sdf.format(new Date(secs *
1000)));
+return sdf.format(new Date(secs * 1000));
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1410766 - /tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
Author: rjung
Date: Sat Nov 17 19:47:59 2012
New Revision: 1410766
URL: http://svn.apache.org/viewvc?rev=1410766&view=rev
Log:
Sorry, committed debug code in r1410763.
Modified:
tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
Modified: tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java?rev=1410766&r1=1410765&r2=1410766&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java Sat
Nov 17 19:47:59 2012
@@ -89,7 +89,6 @@ public class TestAccessLogValve {
}
private String generateExpected(SimpleDateFormat sdf, long secs) {
-System.out.println("generateExpected: " + sdf.format(new Date(secs *
1000)));
return sdf.format(new Date(secs * 1000));
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1410770 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/valves/TestAccessLogValve.java webapps/docs/changelog.xml
Author: rjung
Date: Sat Nov 17 19:54:35 2012
New Revision: 1410770
URL: http://svn.apache.org/viewvc?rev=1410770&view=rev
Log:
Fix time zone formatting in ALV test.
Test failed in non-GMT time zone.
Backport of r1410763 and r1410766 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1410763,1410766
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java?rev=1410770&r1=1410769&r2=1410770&view=diff
==
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestAccessLogValve.java
Sat Nov 17 19:54:35 2012
@@ -34,7 +34,7 @@ public class TestAccessLogValve {
final int cacheSize = 10;
SimpleDateFormat sdf =
-new SimpleDateFormat("dd/MMM/:HH:mm:ss", Locale.US);
+new SimpleDateFormat("[dd/MMM/:HH:mm:ss Z]", Locale.US);
sdf.setTimeZone(TimeZone.getDefault());
AccessLogValve.DateFormatCache dfc =
@@ -89,6 +89,6 @@ public class TestAccessLogValve {
}
private String generateExpected(SimpleDateFormat sdf, long secs) {
-return "[" + sdf.format(new Date(secs * 1000)) + " +]";
+return sdf.format(new Date(secs * 1000));
}
}
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=1410770&r1=1410769&r2=1410770&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Nov 17 19:54:35 2012
@@ -53,6 +53,15 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+
+
+
+
+Fix unit test for AccessLogValve when using non-GMT time zone. (rjung)
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1410896 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/mapper/ test/org/apache/cat
Author: rjung
Date: Sun Nov 18 15:27:56 2012
New Revision: 1410896
URL: http://svn.apache.org/viewvc?rev=1410896&view=rev
Log:
Type-safety for the Mapper - Part 2/2
Use generics for MapElement and specialize MappedHost,
MapedContext and MappedWrapper to host, Context and Wrapper.
Remove unneeded casts in all code using the Mapper.
Use real Host, Context and Wrapper objects in TestMapper.
Future possible work: restrict Context parents to Host.
Otherwise MapperListener can't register a new Context.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java
tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java
tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1410896&r1=1410895&r2=1410896&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Sun Nov 18 15:27:56 2012
@@ -457,7 +457,7 @@ public abstract class AuthenticatorBase
// The Servlet may specify security constraints through annotations.
// Ensure that they have been processed before constraints are checked
-Wrapper wrapper = (Wrapper) request.getMappingData().wrapper;
+Wrapper wrapper = request.getMappingData().wrapper;
if (wrapper != null) {
wrapper.servletSecurityAnnotationScan();
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1410896&r1=1410895&r2=1410896&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Sun Nov
18 15:27:56 2012
@@ -257,7 +257,7 @@ public class CoyoteAdapter implements Ad
req.getRequestProcessor().setWorkerThreadName(null);
// Recycle the wrapper request and response
if (error || response.isClosed() || !request.isComet()) {
-((Context) request.getMappingData().context).logAccess(
+request.getMappingData().context.logAccess(
request, response,
System.currentTimeMillis() - req.getStartTime(),
false);
@@ -288,7 +288,7 @@ public class CoyoteAdapter implements Ad
// Have to test this first since state may change while in this
// method and this is only required if entering this method in
// this state
-Context ctxt = (Context) request.getMappingData().context;
+Context ctxt = request.getMappingData().context;
if (ctxt != null) {
ctxt.fireRequestDestroyEvent(request);
}
@@ -364,7 +364,7 @@ public class CoyoteAdapter implements Ad
request.finishRequest();
response.finishResponse();
req.action(ActionCode.POST_REQUEST , null);
-((Context) request.getMappingData().context).logAccess(
+request.getMappingData().context.logAccess(
request, response,
System.currentTimeMillis() - req.getStartTime(),
false);
@@ -477,7 +477,7 @@ public class CoyoteAdapter implements Ad
// If postParseRequest() failed, it has already logged it.
// If context is null this was the start of a comet request
// that failed and has already been logged.
-((Context) request.getMappingData().context).logAccess(
+request.getMappingData().context.logAccess(
request, response,
System.currentTimeMillis() - req.getStartTime(),
false);
@@ -538,11 +538,11 @@ public class CoyoteAdapter implements Ad
if (request.mappingData != null) {
if (request.mappingData.context != null) {
logged = true;
-((Context) request.mappingData.context).logAccess(
+requ
svn commit: r1410899 - /tomcat/trunk/webapps/docs/changelog.xml
Author: rjung Date: Sun Nov 18 15:34:44 2012 New Revision: 1410899 URL: http://svn.apache.org/viewvc?rev=1410899&view=rev Log: Add Mapper type-safety to changelog. I don't expect this to get backported to TC 7. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1410899&r1=1410898&r2=1410899&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Sun Nov 18 15:34:44 2012 @@ -75,6 +75,12 @@ property in JDBCAccessLogValve. (markt) +Make the Mapper type-safe. Hosts, Contexts and Wrappers are no +longer handled as plain objects, instead they keep their type. +Code using the Mapper doesn't need to cast objects returned by +the mapper. (rjung) + + Move Manager, Loader and Resources from Container to Context since Context is the only place they are used. The documentation already states (and has done for some time) that Context is the only valid @@ -85,7 +91,7 @@ identical for all Connectors of a given Service and it is common for there to be multiple Connectors for a Service (http, https and ajp). This means there is now only ever one Mapper per Service rather than -possibly multiple identically configured Mapper obejcts. (markt) +possibly multiple identically configured Mapper objects. (markt) Remove the per Context Mapper objects and use the Mapper from the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1414889 - in /tomcat/trunk: java/org/apache/catalina/valves/AccessLogValve.java java/org/apache/catalina/valves/LocalStrings.properties java/org/apache/catalina/valves/mbeans-descriptors.
Author: rjung
Date: Wed Nov 28 20:04:52 2012
New Revision: 1414889
URL: http://svn.apache.org/viewvc?rev=1414889&view=rev
Log:
Add new ALV attribute "renameOnRotate" (Default:false).
If set to "true", the "fileDateFormat" will not be part
of the current log file. Only at the time of log rotation
the file is renamed to the final name including the
"fileDateFormat".
This mimics the behavior e.g. of Log4J and similar frameworks,
where the active file does not have the timestamp in the file
name.
Pro: current file has stable name, all files with
timestamp in name are old.
Con: Slightly more complex impl.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1414889&r1=1414888&r2=1414889&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Wed Nov 28
20:04:52 2012
@@ -208,6 +208,12 @@ public class AccessLogValve extends Valv
*/
protected boolean rotatable = true;
+/**
+ * Should we defer inclusion of the date stamp in the file
+ * name until rotate time? Default is false.
+ */
+protected boolean renameOnRotate = false;
+
/**
* Buffered logging.
@@ -729,6 +735,26 @@ public class AccessLogValve extends Valv
/**
+ * Should we defer inclusion of the date stamp in the file
+ * name until rotate time
+ */
+public boolean isRenameOnRotate() {
+return renameOnRotate;
+}
+
+
+/**
+ * Set the value if we should defer inclusion of the date
+ * stamp in the file name until rotate time
+ *
+ * @param renameOnRotate true if defer inclusion of date stamp
+ */
+public void setRenameOnRotate(boolean renameOnRotate) {
+this.renameOnRotate = renameOnRotate;
+}
+
+
+/**
* Is the logging buffered
*/
public boolean isBuffered() {
@@ -968,7 +994,7 @@ public class AccessLogValve extends Valv
if (currentLogFile != null) {
File holder = currentLogFile;
-close();
+close(false);
try {
holder.renameTo(new File(newFileName));
} catch (Throwable e) {
@@ -994,12 +1020,76 @@ public class AccessLogValve extends Valv
/**
* Close the currently open log file (if any)
*/
-private synchronized void close() {
+private File getLogFile(boolean useDateStamp) {
+
+// Create the directory if necessary
+File dir = new File(directory);
+if (!dir.isAbsolute()) {
+dir = new File(getContainer().getCatalinaBase(), directory);
+}
+if (!dir.mkdirs() && !dir.isDirectory()) {
+log.error(sm.getString("accessLogValve.openDirFail", dir));
+}
+
+// Calculate the current log file name
+File pathname;
+if (useDateStamp) {
+pathname = new File(dir.getAbsoluteFile(), prefix + dateStamp
++ suffix);
+} else {
+pathname = new File(dir.getAbsoluteFile(), prefix + suffix);
+}
+File parent = pathname.getParentFile();
+if (!parent.mkdirs() && !parent.isDirectory()) {
+log.error(sm.getString("accessLogValve.openDirFail", parent));
+}
+return pathname;
+}
+
+/**
+ * Move a current but rotated log file back to the unrotated
+ * one. Needed if date stamp inclusion is deferred to rotation
+ * time.
+ */
+private void restore() {
+File newLogFile = getLogFile(false);
+File rotatedLogFile = getLogFile(true);
+if (rotatedLogFile.exists() && !newLogFile.exists() &&
+!rotatedLogFile.equals(newLogFile)) {
+try {
+if (!rotatedLogFile.renameTo(newLogFile)) {
+log.error(sm.getString("accessLogValve.renameFail",
rotatedLogFile, newLogFile));
+}
+} catch (Throwable e) {
+ExceptionUtils.handleThrowable(e);
+log.error(sm.getString("accessLogValve.renameFail",
rotatedLogFile, newLogFile), e);
+}
+}
+}
+
+
+/**
+ * Close the currently open log file (if any)
+ *
+ * @param rename Rename file to final name after closing
+ */
+private synchronized void close(boolean rename) {
if (writer == null) {
svn commit: r1415081 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ webapps/docs/ webapps/docs/config/
Author: rjung
Date: Thu Nov 29 08:33:47 2012
New Revision: 1415081
URL: http://svn.apache.org/viewvc?rev=1415081&view=rev
Log:
Add new ALV attribute "renameOnRotate" (Default:false).
If set to "true", the "fileDateFormat" will not be part
of the current log file. Only at the time of log rotation
the file is renamed to the final name including the
"fileDateFormat".
This mimics the behavior e.g. of Log4J and similar frameworks,
where the active file does not have the timestamp in the file
name.
Pro: current file has stable name, all files with
timestamp in name are old.
Con: Slightly more complex impl.
Backport of r1414889 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1414889
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1415081&r1=1415080&r2=1415081&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Thu Nov 29 08:33:47 2012
@@ -213,6 +213,12 @@ public class AccessLogValve extends Valv
*/
protected boolean rotatable = true;
+/**
+ * Should we defer inclusion of the date stamp in the file
+ * name until rotate time? Default is false.
+ */
+protected boolean renameOnRotate = false;
+
/**
* Buffered logging.
@@ -725,6 +731,26 @@ public class AccessLogValve extends Valv
/**
+ * Should we defer inclusion of the date stamp in the file
+ * name until rotate time
+ */
+public boolean isRenameOnRotate() {
+return renameOnRotate;
+}
+
+
+/**
+ * Set the value if we should defer inclusion of the date
+ * stamp in the file name until rotate time
+ *
+ * @param renameOnRotate true if defer inclusion of date stamp
+ */
+public void setRenameOnRotate(boolean renameOnRotate) {
+this.renameOnRotate = renameOnRotate;
+}
+
+
+/**
* Is the logging buffered
*/
public boolean isBuffered() {
@@ -974,7 +1000,7 @@ public class AccessLogValve extends Valv
if (currentLogFile != null) {
File holder = currentLogFile;
-close();
+close(false);
try {
holder.renameTo(new File(newFileName));
} catch (Throwable e) {
@@ -1000,12 +1026,76 @@ public class AccessLogValve extends Valv
/**
* Close the currently open log file (if any)
*/
-private synchronized void close() {
+private File getLogFile(boolean useDateStamp) {
+
+// Create the directory if necessary
+File dir = new File(directory);
+if (!dir.isAbsolute()) {
+dir = new File(System.getProperty(Globals.CATALINA_BASE_PROP),
directory);
+}
+if (!dir.mkdirs() && !dir.isDirectory()) {
+log.error(sm.getString("accessLogValve.openDirFail", dir));
+}
+
+// Calculate the current log file name
+File pathname;
+if (useDateStamp) {
+pathname = new File(dir.getAbsoluteFile(), prefix + dateStamp
++ suffix);
+} else {
+pathname = new File(dir.getAbsoluteFile(), prefix + suffix);
+}
+File parent = pathname.getParentFile();
+if (!parent.mkdirs() && !parent.isDirectory()) {
+log.error(sm.getString("accessLogValve.openDirFail", parent));
+}
+return pathname;
+}
+
+/**
+ * Move a current but rotated log file back to the unrotated
+ * one. Needed if date stamp inclusion is deferred to rotation
+ * time.
+ */
+private void restore() {
+File newLogFile = getLogFile(false);
+File rotatedLogFile = getLogFile(true);
+if (rotatedLogFile.exists() && !newLogFile.exists() &&
+!rotatedLogFile.equals(newLogFile)) {
+try {
+if (!rotatedLogFile.renameTo(newLogFile)) {
+log.error(sm.getString("accessLogValve.renameFail",
rotatedLogFile, newLogFile));
+}
+} catch (Throwable e) {
+ExceptionUtils.ha
svn commit: r1415186 - /tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Author: rjung
Date: Thu Nov 29 14:44:53 2012
New Revision: 1415186
URL: http://svn.apache.org/viewvc?rev=1415186&view=rev
Log:
Fix javadoc.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1415186&r1=1415185&r2=1415186&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Thu Nov 29
14:44:53 2012
@@ -1018,7 +1018,12 @@ public class AccessLogValve extends Valv
/**
- * Close the currently open log file (if any)
+ * Create a File object based on the current log file name.
+ * Directories are created as needed but the underlying file
+ * is not created or opened.
+ *
+ * @param useDateStamp include the timestamp in the file name.
+ * @return the log file object
*/
private File getLogFile(boolean useDateStamp) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1415188 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/AccessLogValve.java
Author: rjung
Date: Thu Nov 29 14:46:10 2012
New Revision: 1415188
URL: http://svn.apache.org/viewvc?rev=1415188&view=rev
Log:
Fix javadoc.
Backport of r1415186 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1415186
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1415188&r1=1415187&r2=1415188&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Thu Nov 29 14:46:10 2012
@@ -1024,7 +1024,12 @@ public class AccessLogValve extends Valv
/**
- * Close the currently open log file (if any)
+ * Create a File object based on the current log file name.
+ * Directories are created as needed but the underlying file
+ * is not created or opened.
+ *
+ * @param useDateStamp include the timestamp in the file name.
+ * @return the log file object
*/
private File getLogFile(boolean useDateStamp) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1416529 - in /tomcat/trunk/java/org/apache/catalina/valves: AccessLogValve.java LocalStrings.properties
Author: rjung
Date: Mon Dec 3 14:10:30 2012
New Revision: 1416529
URL: http://svn.apache.org/viewvc?rev=1416529&view=rev
Log:
Only rename AccessLogValve file with renameOnrotate=true
if target file does not already exist.
We don't want to overwrite existing files. Prefer
not to rotate.
Typical case would be several ALV instances configured to
use the same file name. Only the first one should rename
on rotate.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1416529&r1=1416528&r2=1416529&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Mon Dec 3
14:10:30 2012
@@ -1086,13 +1086,17 @@ public class AccessLogValve extends Valv
writer.close();
if (rename && renameOnRotate) {
File newLogFile = getLogFile(true);
-try {
-if (!currentLogFile.renameTo(newLogFile)) {
-log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile));
+if (!newLogFile.exists()) {
+try {
+if (!currentLogFile.renameTo(newLogFile)) {
+log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile));
+}
+} catch (Throwable e) {
+ExceptionUtils.handleThrowable(e);
+log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile), e);
}
-} catch (Throwable e) {
-ExceptionUtils.handleThrowable(e);
-log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile), e);
+} else {
+log.error(sm.getString("accessLogValve.alreadyExists",
currentLogFile, newLogFile));
}
}
writer = null;
Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1416529&r1=1416528&r2=1416529&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties Mon
Dec 3 14:10:30 2012
@@ -23,6 +23,7 @@ accessLogValve.closeFail=Failed to close
accessLogValve.openDirFail=Failed to create directory [{0}] for access logs
accessLogValve.rotateFail=Failed to rotate access log
accessLogValve.renameFail=Failed to rename access log from [{0}] to [{1}]
+accessLogValve.alreadyExists=Failed to rename access log from [{0}] to [{1}],
file already exists.
accessLogValve.invalidLocale=Failed to set locale to [{0}]
accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use
the system default character set.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1416531 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/AccessLogValve.java java/org/apache/catalina/valves/LocalStrings.properties
Author: rjung
Date: Mon Dec 3 14:13:04 2012
New Revision: 1416531
URL: http://svn.apache.org/viewvc?rev=1416531&view=rev
Log:
Only rename AccessLogValve file with renameOnrotate=true
if target file does not already exist.
We don't want to overwrite existing files. Prefer
not to rotate.
Typical case would be several ALV instances configured to
use the same file name. Only the first one should rename
on rotate.
Backport of r1416529 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1416529
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1416531&r1=1416530&r2=1416531&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Mon Dec 3 14:13:04 2012
@@ -1092,13 +1092,17 @@ public class AccessLogValve extends Valv
writer.close();
if (rename && renameOnRotate) {
File newLogFile = getLogFile(true);
-try {
-if (!currentLogFile.renameTo(newLogFile)) {
-log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile));
+if (!newLogFile.exists()) {
+try {
+if (!currentLogFile.renameTo(newLogFile)) {
+log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile));
+}
+} catch (Throwable e) {
+ExceptionUtils.handleThrowable(e);
+log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile), e);
}
-} catch (Throwable e) {
-ExceptionUtils.handleThrowable(e);
-log.error(sm.getString("accessLogValve.renameFail",
currentLogFile, newLogFile), e);
+} else {
+log.error(sm.getString("accessLogValve.alreadyExists",
currentLogFile, newLogFile));
}
}
writer = null;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1416531&r1=1416530&r2=1416531&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Mon Dec 3 14:13:04 2012
@@ -27,6 +27,7 @@ accessLogValve.closeFail=Failed to close
accessLogValve.openDirFail=Failed to create directory [{0}] for access logs
accessLogValve.rotateFail=Failed to rotate access log
accessLogValve.renameFail=Failed to rename access log from [{0}] to [{1}]
+accessLogValve.alreadyExists=Failed to rename access log from [{0}] to [{1}],
file already exists.
accessLogValve.invalidLocale=Failed to set locale to [{0}]
accessLogValve.unsupportedEncoding=Failed to set encoding to [{0}], will use
the system default character set.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417347 - /tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Author: rjung
Date: Wed Dec 5 10:48:40 2012
New Revision: 1417347
URL: http://svn.apache.org/viewvc?rev=1417347&view=rev
Log:
Style.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1417347&r1=1417346&r2=1417347&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Wed Dec 5
10:48:40 2012
@@ -842,7 +842,7 @@ public class AccessLogValve extends Valv
* Set the date format date based log rotation.
*/
public void setFileDateFormat(String fileDateFormat) {
-this.fileDateFormat = fileDateFormat;
+this.fileDateFormat = fileDateFormat;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417348 - /tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Author: rjung Date: Wed Dec 5 10:49:53 2012 New Revision: 1417348 URL: http://svn.apache.org/viewvc?rev=1417348&view=rev Log: Fix javadoc. Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1417348&r1=1417347&r2=1417348&view=diff == --- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Wed Dec 5 10:49:53 2012 @@ -234,8 +234,8 @@ public class AccessLogValve extends Valv /** - * A date formatter to format a Date into a date in the format - * "-MM-dd". + * A date formatter to format a Date using the format + * given by fileDateFormat. */ protected SimpleDateFormat fileDateFormatter = null; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417352 - in /tomcat/trunk: conf/server.xml java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/config/valve.xml
Author: rjung
Date: Wed Dec 5 10:56:17 2012
New Revision: 1417352
URL: http://svn.apache.org/viewvc?rev=1417352&view=rev
Log:
Move trailing dot in default ALV prefix
to leading dot in fileDateFormat.
This gives better behavior over a broader range
of config combinations.
Modified:
tomcat/trunk/conf/server.xml
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/server.xml?rev=1417352&r1=1417351&r2=1417352&view=diff
==
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Wed Dec 5 10:56:17 2012
@@ -133,7 +133,7 @@
Documentation at: /docs/config/valve.html
Note: The pattern used is equivalent to using pattern="common" -->
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1417352&r1=1417351&r2=1417352&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Wed Dec 5
10:56:17 2012
@@ -200,7 +200,7 @@ public class AccessLogValve extends Valv
/**
* The prefix that is added to log file filenames.
*/
-protected String prefix = "access_log.";
+protected String prefix = "access_log";
/**
@@ -1233,7 +1233,7 @@ public class AccessLogValve extends Valv
// Initialize the Date formatters
String format = getFileDateFormat();
if (format == null || format.length() == 0) {
-format = "-MM-dd";
+format = ".-MM-dd";
setFileDateFormat(format);
}
fileDateFormatter = new SimpleDateFormat(format, Locale.US);
Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1417352&r1=1417351&r2=1417352&view=diff
==
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Wed Dec 5 10:56:17 2012
@@ -226,8 +226,8 @@
Allows a customized date format in the access log file name.
The date format also decides how often the file is rotated.
If you wish to rotate every hour, then set this value
- to: -MM-dd.HH. The default value is
- -MM-dd. The date format will always be localized
+ to: .-MM-dd.HH. The default value is
+ .-MM-dd. The date format will always be localized
using the locale en_US.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417353 - /tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Author: rjung
Date: Wed Dec 5 10:59:10 2012
New Revision: 1417353
URL: http://svn.apache.org/viewvc?rev=1417353&view=rev
Log:
- Move default setting to the right place.
- Don't overwrite fileDateFormat=""
configuration by hard code default.
- remove obsolete comment warning.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1417353&r1=1417352&r2=1417353&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Wed Dec 5
10:59:10 2012
@@ -519,9 +519,9 @@ public class AccessLogValve extends Valv
protected String conditionIf = null;
/**
- * Date format to place in log file name. Use at your own risk!
+ * Date format to place in log file name.
*/
-protected String fileDateFormat = null;
+protected String fileDateFormat = ".-MM-dd";
/**
@@ -1232,8 +1232,8 @@ public class AccessLogValve extends Valv
// Initialize the Date formatters
String format = getFileDateFormat();
-if (format == null || format.length() == 0) {
-format = ".-MM-dd";
+if (format == null) {
+format = "";
setFileDateFormat(format);
}
fileDateFormatter = new SimpleDateFormat(format, Locale.US);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417363 - /tomcat/trunk/webapps/docs/config/valve.xml
Author: rjung Date: Wed Dec 5 11:29:31 2012 New Revision: 1417363 URL: http://svn.apache.org/viewvc?rev=1417363&view=rev Log: Clarify ALV docs (log file name stuff). Modified: tomcat/trunk/webapps/docs/config/valve.xml Modified: tomcat/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1417363&r1=1417362&r2=1417363&view=diff == --- tomcat/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/trunk/webapps/docs/config/valve.xml Wed Dec 5 11:29:31 2012 @@ -80,6 +80,17 @@ AccessLog implementation found to log those requests that are rejected before they are passed to a container. +The output file will be placed in the directory given by the +directory attribute. The name of the file is composed +by concatenation of the configured prefix, timestamp and +suffix. The format of the timestamp in the file name can be +set using the fileDateFormat attribute. This timestamp will +be omitted if the file rotation is switched off by setting +rotatable to false. + +Warning: If multiple AccessLogValve instances +are used, they should be configured to use different output files. + If sendfile is used, the response bytes will be written asynchronously in a separate thread and the access log valve will not know how many bytes were actually written. In this case, the number of bytes that was passed to @@ -175,7 +186,7 @@ Flag to determine if log rotation should occur. If set to false, then this file is never rotated and - fileDateFormat is ignored. Use with caution! + fileDateFormat is ignored. Default value: true @@ -223,11 +234,12 @@ -Allows a customized date format in the access log file name. - The date format also decides how often the file is rotated. +Allows a customized timestamp in the access log file name. + The file is rotated whenever the formatted timestamp changes. + The default value is .-MM-dd. If you wish to rotate every hour, then set this value - to: .-MM-dd.HH. The default value is - .-MM-dd. The date format will always be localized + to .-MM-dd.HH. + The date format will always be localized using the locale en_US. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417370 - /tomcat/trunk/webapps/docs/config/valve.xml
Author: rjung
Date: Wed Dec 5 11:51:01 2012
New Revision: 1417370
URL: http://svn.apache.org/viewvc?rev=1417370&view=rev
Log:
Remove redudant but incompletely maintained attribute
documentation form Extended ALV. Instead refer to the
docs for the base clas and clarify the differences.
Modified:
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1417370&r1=1417369&r2=1417370&view=diff
==
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Wed Dec 5 11:51:01 2012
@@ -349,8 +349,10 @@
-The Extended Access Log Valve supports the following
-configuration attributes:
+The Extended Access Log Valve supports all
+configuration attributes of the standard
+Access Log Valve. Only the
+values used for className and pattern differ.
@@ -360,126 +362,12 @@
use the extended access log valve.
-
-Absolute or relative pathname of a directory in which log files
-created by this valve will be placed. If a relative path is
-specified, it is interpreted as relative to $CATALINA_BASE. If
-no directory attribute is specified, the default value is "logs"
-(relative to $CATALINA_BASE).
-
-
-
-Character set used to write the log file. An empty string means
-to use the system default character set. Default value: use the
-system default character set.
-
-
-
-
-The locale used to format timestamps in the access log
- lines. Any timestamps configured using an
- explicit SimpleDateFormat pattern (%{xxx}t)
- are formatted in this locale. By default the
- default locale of the Java process is used. Switching the
- locale after the AccessLogValve is initialized is not supported.
- Any timestamps using the common log format
- (CLF) are always formatted in the locale
- en_US.
-
-
-
-
-Log message buffers are usually recycled and re-used. To prevent
- excessive memory usage, if a buffer grows beyond this size it will
be
- discarded. The default is 256 characters. This should
be
- set to larger than the typical access log message size.
-
-
A formatting layout identifying the various information fields
from the request and response to be logged.
See below for more information on configuring this attribute.
-
-The prefix added to the start of each log file's name. If not
-specified, the default value is "access_log.".
-
-
-
-Set to true to check for the existence of request
-attributes (typically set by the RemoteIpValve and similar) that should
-be used to override the values returned by the request for remote
-address, remote host, server port and protocol. If the attributes are
-not set, or this attribute is set to false then the values
-from the request will be used. If not set, the default value of
-false will be used.
-
-
-
-This attribute is no longer supported. Use the connector
-attribute enableLookups instead.
-
-
-
-The suffix added to the end of each log file's name. If not
-specified, the default value is "" (a zero-length string),
-meaning that no suffix will be added.
-
-
-
-Flag to determine if log rotation should occur.
- If set to false, then this file is never rotated and
- fileDateFormat is ignored. Use with caution!
- Default value: true
-
-
-
-
-Turns on conditional logging. If set, requests will be
- logged only if ServletRequest.getAttribute() is
- not null. For example, if this value is set to
- important, then a particular request will only be
logged
- if ServletRequest.getAttribute("important") != null.
- The use of Filters is an easy way to set/unset the attribute
- in the ServletRequest on many different requests.
-
-
-
-
-Turns on conditional logging. If set, requests will be
- logged only if ServletRequest.getAttribute() is
- null. For example, if this value is set to
- junk, then a particular request will only be logged
- if ServletRequest.getAttribute("junk") == null.
- The use of Filters is an easy way to set/unset the attribute
- in the ServletRequest on many different requests.
-
-
-
-
-The same as conditi
svn commit: r1417372 - /tomcat/trunk/webapps/docs/config/valve.xml
Author: rjung
Date: Wed Dec 5 11:53:12 2012
New Revision: 1417372
URL: http://svn.apache.org/viewvc?rev=1417372&view=rev
Log:
Logically reorder attribute docs for ALV.
It was neither alphabetical nor especially
logical before. Hope this one is better.
Modified:
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1417372&r1=1417371&r2=1417372&view=diff
==
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Wed Dec 5 11:53:12 2012
@@ -119,70 +119,28 @@
(relative to $CATALINA_BASE).
-
-Character set used to write the log file. An empty string means
-to use the system default character set. Default value: use the
-system default character set.
-
-
-
-
-The locale used to format timestamps in the access log
- lines. Any timestamps configured using an
- explicit SimpleDateFormat pattern (%{xxx}t)
- are formatted in this locale. By default the
- default locale of the Java process is used. Switching the
- locale after the AccessLogValve is initialized is not supported.
- Any timestamps using the common log format
- (CLF) are always formatted in the locale
- en_US.
-
-
-
-
-Log message buffers are usually recycled and re-used. To prevent
- excessive memory usage, if a buffer grows beyond this size it will
be
- discarded. The default is 256 characters. This should
be
- set to larger than the typical access log message size.
-
-
-
-A formatting layout identifying the various information fields
-from the request and response to be logged, or the word
-common or combined to select a
-standard format. See below for more information on configuring
-this attribute.
-
-
The prefix added to the start of each log file's name. If not
specified, the default value is "access_log.".
-
-Set to true to check for the existence of request
-attributes (typically set by the RemoteIpValve and similar) that should
-be used to override the values returned by the request for remote
-address, remote host, server port and protocol. If the attributes are
-not set, or this attribute is set to false then the values
-from the request will be used. If not set, the default value of
-false will be used.
-
-
-
-This attribute is no longer supported. Use the connector
-attribute enableLookups instead.
-If you have enableLookups on the connector set to
-true and want to ignore it, use %a instead of
-%h in the value of pattern.
-
-
The suffix added to the end of each log file's name. If not
specified, the default value is "" (a zero-length string),
meaning that no suffix will be added.
+
+Allows a customized timestamp in the access log file name.
+ The file is rotated whenever the formatted timestamp changes.
+ The default value is .-MM-dd.
+ If you wish to rotate every hour, then set this value
+ to .-MM-dd.HH.
+ The date format will always be localized
+ using the locale en_US.
+
+
+
Flag to determine if log rotation should occur.
If set to false, then this file is never rotated and
@@ -205,6 +163,44 @@
+
+A formatting layout identifying the various information fields
+from the request and response to be logged, or the word
+common or combined to select a
+standard format. See below for more information on configuring
+this attribute.
+
+
+
+Character set used to write the log file. An empty string means
+to use the system default character set. Default value: use the
+system default character set.
+
+
+
+
+The locale used to format timestamps in the access log
+ lines. Any timestamps configured using an
+ explicit SimpleDateFormat pattern (%{xxx}t)
+ are formatted in this locale. By default the
+ default locale of the Java process is used. Switching the
+ locale after the AccessLogValve is initialized is not supported.
+ Any timestamps using the common log format
+ (CLF) are always formatted in the locale
+ en_US.
+
+
+
+
+Set to true to check for the existence of request
+attributes (typically set
svn commit: r1417424 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/AccessLogValve.java
Author: rjung
Date: Wed Dec 5 14:00:15 2012
New Revision: 1417424
URL: http://svn.apache.org/viewvc?rev=1417424&view=rev
Log:
- Style
- Fix Javadoc
- Move default setting to the right place.
- remove obsolete comment warning.
Backport of r1417347, r1417348 and
partially r1417353.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1417347-1417348,1417353
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1417424&r1=1417423&r2=1417424&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Wed Dec 5 14:00:15 2012
@@ -239,8 +239,8 @@ public class AccessLogValve extends Valv
/**
- * A date formatter to format a Date into a date in the format
- * "-MM-dd".
+ * A date formatter to format a Date using the format
+ * given by fileDateFormat.
*/
protected SimpleDateFormat fileDateFormatter = null;
@@ -529,9 +529,9 @@ public class AccessLogValve extends Valv
protected String conditionIf = null;
/**
- * Date format to place in log file name. Use at your own risk!
+ * Date format to place in log file name.
*/
-protected String fileDateFormat = null;
+protected String fileDateFormat = "-MM-dd";
/**
@@ -856,7 +856,7 @@ public class AccessLogValve extends Valv
* Set the date format date based log rotation.
*/
public void setFileDateFormat(String fileDateFormat) {
-this.fileDateFormat = fileDateFormat;
+this.fileDateFormat = fileDateFormat;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417437 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/valve.xml
Author: rjung
Date: Wed Dec 5 14:25:00 2012
New Revision: 1417437
URL: http://svn.apache.org/viewvc?rev=1417437&view=rev
Log:
Improve ALV docs:
- Log file name stuff
- Remove redudant but incompletely maintained attribute
documentation form Extended ALV. Instead refer to the
docs for the base clas and clarify the differences.
- Logically reorder attribute docs for ALV.
It was neither alphabetical nor especially
logical before. Hope this one is better.
Backports of r1417363 and r1417370-1417372
with a small difference in a skipped leading dot
in fileDateFormat example and default.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1417363,1417370-1417372
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml?rev=1417437&r1=1417436&r2=1417437&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Wed Dec 5 14:25:00 2012
@@ -80,6 +80,17 @@
AccessLog implementation found to log those requests that are
rejected before they are passed to a container.
+The output file will be placed in the directory given by the
+directory attribute. The name of the file is composed
+by concatenation of the configured prefix, timestamp and
+suffix. The format of the timestamp in the file name can be
+set using the fileDateFormat attribute. This timestamp will
+be omitted if the file rotation is switched off by setting
+rotatable to false.
+
+Warning: If multiple AccessLogValve instances
+are used, they should be configured to use different output files.
+
If sendfile is used, the response bytes will be written asynchronously
in a separate thread and the access log valve will not know how many bytes
were actually written. In this case, the number of bytes that was passed to
@@ -108,67 +119,32 @@
(relative to $CATALINA_BASE).
-
-Character set used to write the log file. An empty string means
-to use the system default character set. Default value: use the
-system default character set.
-
-
-
-
-The locale used to format timestamps in the access log
- lines. Any timestamps configured using an
- explicit SimpleDateFormat pattern (%{xxx}t)
- are formatted in this locale. By default the
- default locale of the Java process is used. Switching the
- locale after the AccessLogValve is initialized is not supported.
- Any timestamps using the common log format
- (CLF) are always formatted in the locale
- en_US.
-
-
-
-
-A formatting layout identifying the various information fields
-from the request and response to be logged, or the word
-common or combined to select a
-standard format. See below for more information on configuring
-this attribute.
-
-
The prefix added to the start of each log file's name. If not
specified, the default value is "access_log.".
-
-Set to true to check for the existence of request
-attributes (typically set by the RemoteIpValve and similar) that should
-be used to override the values returned by the request for remote
-address, remote host, server port and protocol. If the attributes are
-not set, or this attribute is set to false then the values
-from the request will be used. If not set, the default value of
-false will be used.
-
-
-
-This attribute is no longer supported. Use the connector
-attribute enableLookups instead.
-If you have enableLookups on the connector set to
-true and want to ignore it, use %a instead of
-%h in the value of pattern.
-
-
The suffix added to the end of each log file's name. If not
specified, the default value is "" (a zero-length string),
meaning that no suffix will be added.
+
+Allows a customized timestamp in the access log file name.
+ The file is rotated whenever the formatted timestamp changes.
+ The default value is -MM-dd.
+ If you wish to rotate every hour, then set this value
+ to -MM-dd.HH.
+ The date format will always be localized
+ using the locale en_US.
+
+
+
Flag to determine if log rotation should occur.
If set to false, then this file is never rotated and
-
svn commit: r1417444 - /tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml
Author: rjung Date: Wed Dec 5 14:38:12 2012 New Revision: 1417444 URL: http://svn.apache.org/viewvc?rev=1417444&view=rev Log: Remove "maxLogMessageBufferSize" ALV attribute from docs. It only exists in trunk and has erroneously been added to the docs in backport r1417437. Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml?rev=1417444&r1=1417443&r2=1417444&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Wed Dec 5 14:38:12 2012 @@ -236,13 +236,6 @@ - -Log message buffers are usually recycled and re-used. To prevent - excessive memory usage, if a buffer grows beyond this size it will be - discarded. The default is 256 characters. This should be - set to larger than the typical access log message size. - - This attribute is no longer supported. Use the connector attribute enableLookups instead. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417463 - in /tomcat/trunk/webapps/docs: appdev/project.xml architecture/project.xml config/project.xml funcspecs/project.xml project.xml tribes/project.xml
Author: rjung Date: Wed Dec 5 15:01:24 2012 New Revision: 1417463 URL: http://svn.apache.org/viewvc?rev=1417463&view=rev Log: Make docs menues consistent in the various levels. Modified: tomcat/trunk/webapps/docs/appdev/project.xml tomcat/trunk/webapps/docs/architecture/project.xml tomcat/trunk/webapps/docs/config/project.xml tomcat/trunk/webapps/docs/funcspecs/project.xml tomcat/trunk/webapps/docs/project.xml tomcat/trunk/webapps/docs/tribes/project.xml Modified: tomcat/trunk/webapps/docs/appdev/project.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/project.xml?rev=1417463&r1=1417462&r2=1417463&view=diff == --- tomcat/trunk/webapps/docs/appdev/project.xml (original) +++ tomcat/trunk/webapps/docs/appdev/project.xml Wed Dec 5 15:01:24 2012 @@ -29,6 +29,8 @@ + +http://wiki.apache.org/tomcat/FAQ"; /> Modified: tomcat/trunk/webapps/docs/architecture/project.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/project.xml?rev=1417463&r1=1417462&r2=1417463&view=diff == --- tomcat/trunk/webapps/docs/architecture/project.xml (original) +++ tomcat/trunk/webapps/docs/architecture/project.xml Wed Dec 5 15:01:24 2012 @@ -29,6 +29,8 @@ + +http://wiki.apache.org/tomcat/FAQ"; /> Modified: tomcat/trunk/webapps/docs/config/project.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/project.xml?rev=1417463&r1=1417462&r2=1417463&view=diff == --- tomcat/trunk/webapps/docs/config/project.xml (original) +++ tomcat/trunk/webapps/docs/config/project.xml Wed Dec 5 15:01:24 2012 @@ -30,6 +30,7 @@ +http://wiki.apache.org/tomcat/FAQ"; /> Modified: tomcat/trunk/webapps/docs/funcspecs/project.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/funcspecs/project.xml?rev=1417463&r1=1417462&r2=1417463&view=diff == --- tomcat/trunk/webapps/docs/funcspecs/project.xml (original) +++ tomcat/trunk/webapps/docs/funcspecs/project.xml Wed Dec 5 15:01:24 2012 @@ -29,6 +29,7 @@ +http://wiki.apache.org/tomcat/FAQ"; /> Modified: tomcat/trunk/webapps/docs/project.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=1417463&r1=1417462&r2=1417463&view=diff == --- tomcat/trunk/webapps/docs/project.xml (original) +++ tomcat/trunk/webapps/docs/project.xml Wed Dec 5 15:01:24 2012 @@ -93,6 +93,7 @@ + Modified: tomcat/trunk/webapps/docs/tribes/project.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tribes/project.xml?rev=1417463&r1=1417462&r2=1417463&view=diff == --- tomcat/trunk/webapps/docs/tribes/project.xml (original) +++ tomcat/trunk/webapps/docs/tribes/project.xml Wed Dec 5 15:01:24 2012 @@ -27,6 +27,7 @@ + http://wiki.apache.org/tomcat/FAQ"; /> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417465 - in /tomcat/trunk: build.xml webapps/docs/tomcat-docs.xsl
Author: rjung
Date: Wed Dec 5 15:06:38 2012
New Revision: 1417465
URL: http://svn.apache.org/viewvc?rev=1417465&view=rev
Log:
Pass some more context information to style
sheet which generates docs. Will be used
when embedding the docs comments feature.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/tomcat-docs.xsl
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1417465&r1=1417464&r2=1417465&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Dec 5 15:06:38 2012
@@ -814,8 +814,11 @@
destdir="${tomcat.build}/webapps/docs"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="build.xml project.xml"
includes="*.xml">
+
+
@@ -825,8 +828,11 @@
destdir="${tomcat.build}/webapps/docs/appdev"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+
+
@@ -836,8 +842,11 @@
destdir="${tomcat.build}/webapps/docs/funcspecs"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+
+
@@ -847,8 +856,11 @@
destdir="${tomcat.build}/webapps/docs/config"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+
+
@@ -858,8 +870,11 @@
destdir="${tomcat.build}/webapps/docs/architecture"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+
+
@@ -870,8 +885,11 @@
destdir="${tomcat.build}/webapps/docs/tribes"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+
+
Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1417465&r1=1417464&r2=1417465&view=diff
==
--- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Wed Dec 5 15:06:38 2012
@@ -35,8 +35,10 @@
+
+
@@ -44,6 +46,8 @@
http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
http://svn.apache.org/viewvc?view=rev&rev='"/>
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417467 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl
Author: rjung
Date: Wed Dec 5 15:07:34 2012
New Revision: 1417467
URL: http://svn.apache.org/viewvc?rev=1417467&view=rev
Log:
Add a CSS style "notice".
Will be used for the docs comments feature.
Modified:
tomcat/trunk/webapps/docs/tomcat-docs.xsl
Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1417467&r1=1417466&r2=1417467&view=diff
==
--- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Wed Dec 5 15:07:34 2012
@@ -96,6 +96,15 @@
.wrapped-source div { margin: 0 0 0 1.25em; }
.wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; }
+
+p.notice {
+border: 1px solid rgb(255, 0, 0);
+background-color: rgb(238, 238, 238);
+color: rgb(0, 51, 102);
+padding: 0.5em;
+margin: 1em 2em 1em 1em;
+}
+
svn commit: r1417469 - /tomcat/trunk/build.xml
Author: rjung Date: Wed Dec 5 15:11:08 2012 New Revision: 1417469 URL: http://svn.apache.org/viewvc?rev=1417469&view=rev Log: Fix sitedir. Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1417469&r1=1417468&r2=1417469&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Wed Dec 5 15:11:08 2012 @@ -817,7 +817,7 @@ filenameparameter="filename" excludes="build.xml project.xml" includes="*.xml"> - + @@ -831,7 +831,7 @@ filenameparameter="filename" excludes="project.xml" includes="*.xml"> - + @@ -845,7 +845,7 @@ filenameparameter="filename" excludes="project.xml" includes="*.xml"> - + @@ -859,7 +859,7 @@ filenameparameter="filename" excludes="project.xml" includes="*.xml"> - + @@ -873,7 +873,7 @@ filenameparameter="filename" excludes="project.xml" includes="*.xml"> - + @@ -888,7 +888,7 @@ filenameparameter="filename" excludes="project.xml" includes="*.xml"> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1417424 - svn:log
Author: rjung Revision: 1417424 Modified property: svn:log Modified: svn:log at Wed Dec 5 15:24:13 2012 -- --- svn:log (original) +++ svn:log Wed Dec 5 15:24:13 2012 @@ -1,6 +1,6 @@ - Style - Fix Javadoc -- Move default setting to the right place. +- Add setting fileDateFormat default to the right place. - remove obsolete comment warning. Backport of r1417347, r1417348 and - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1417624 [16/38] - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ appdev/ appdev/sample/ appdev/sample/docs/ appdev/sample/src/ appdev/sample/src/mypackage/ appdev/sample/web/ appdev/s
Added: tomcat/site/trunk/docs/tomcat-8.0-doc/config/manager.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.0-doc/config/manager.html?rev=1417624&view=auto
==
--- tomcat/site/trunk/docs/tomcat-8.0-doc/config/manager.html (added)
+++ tomcat/site/trunk/docs/tomcat-8.0-doc/config/manager.html Wed Dec 5
20:20:35 2012
@@ -0,0 +1,411 @@
+Apache Tomcat 8 Configuration Reference (8.0.0-dev)
- The Manager Component
+.noPrint {display: none;}
+td#mainBody {width: 100%;}
+
+code {background-color:rgb(224,255,255);padding:0 0.1em;}
+code.attributeName, code.propertyName
{background-color:transparent;}
+
+.wrapped-source code { display: block; background-color:
transparent; }
+.wrapped-source div { margin: 0 0 0 1.25em; }
+.wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; }
+
+p.notice {
+border: 1px solid rgb(255, 0, 0);
+background-color: rgb(238, 238, 238);
+color: rgb(0, 51, 102);
+padding: 0.5em;
+margin: 1em 2em 1em 1em;
+}
+http://tomcat.apache.org/";>Apache
Tomcat 8Version 8.0.0-dev,
Dec 5 2012http://www.apache.org/";>LinksDocs HomeConfig Ref.
Homehttp://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsTop Level
ElementsServerServiceExecutorsExecuto
rConnectorsHTTPAJPContainersContextEngineHostClusterNested
ComponentsGlobal
ResourcesJarScannerListenersLoaderManagerRealmResourcesValveCluster
ElementsClusterManagerChannelChannel/M
embershipChannel/SenderChannel/ReceiverChannel/InterceptorValveDeployerClusterListenerOtherFilterSystem
propertiesThe Manager ComponentTable of
Contents
+IntroductionAttributesCommon
AttributesStandard
ImplementationNested
ComponentsSpecial
FeaturesPersistence Across
RestartsDisable Session
Persistence
+Introduction
+
+ The Manager element represents the session
+ manager that will be used to create and maintain HTTP sessions
+ as requested by the associated web application.
+
+ A Manager element MAY be nested inside a
+ Context component. If it is not included,
+ a default Manager configuration will be created automatically, which
+ is sufficient for most requirements, — see
+ Standard Manager Implementation below for the details
+ of this configuration.
+
+Attributes
+
+ Common
Attributes
+
+All implementations of Manager
+support the following attributes:
+
+AttributeDescriptionclassName
+Java class name of the implementation to use. This class must
+implement the org.apache.catalina.Manager interface.
+If not specified, the standard value (defined below) will be used.
+ distributable
+Set to true to ask the session manager to enforce
+the restrictions described in the Servlet Specification on
+distributable applications (primarily, this would mean that all
+session attributes must implement java.io.Serializable).
+Set to false (the default) to not enforce these
+restrictions.
+
+NOTE - The value for this property is inherited
+automatically based on the presence or absence of the
+ element in the web application
+deployment descriptor (/WEB-INF/web.xml).
+ maxActiveSessions
+The maximum number of active sessions that will be created by
+this Manager, or -1 (the default) for no limit.
+
+When the limit is reached, any attempt to create a new session
+(e.g. with HttpServletRequest.getSession() call)
+will fail with an IllegalStateException.
+ maxInactiveInterval
+The initial maximum time interval, in seconds,
+between client requests before a session is invalidated. A negative
value
+will result in sessions never timing out. If the attribute is not
provided,
+a default of 1800 seconds (30 minutes) is used.
+
+This attribute provides the initial value whenever a
+new session is created, but the interval may be dynamically
+varied by a servlet via the
+setMaxInactiveInterval method of the
HttpSession object.
+ sessionIdLength
+ The length of session ids created by this Manager, measured in bytes,
+excluding subsequent conversion to a hexadecimal string and
+excluding any JVM route information used for load balancing.
+The default is 16.
+
+
+
+
+
+ Standard
Implementation
+
+Tomcat provides two standard implementations of Manager
+for use — the default one stores active sessions, while the optional
one
+stores active sessions that have been swapped out (in addition to saving
+sessions across a restart of Tomcat) in a storage location that is selected
+via the use of an appropriate Store nested element.
+
+Standa
svn commit: r1417624 [9/38] - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ appdev/ appdev/sample/ appdev/sample/docs/ appdev/sample/src/ appdev/sample/src/mypackage/ appdev/sample/web/ appdev/sa
Added: tomcat/site/trunk/docs/tomcat-8.0-doc/config/cluster-sender.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.0-doc/config/cluster-sender.html?rev=1417624&view=auto
==
--- tomcat/site/trunk/docs/tomcat-8.0-doc/config/cluster-sender.html (added)
+++ tomcat/site/trunk/docs/tomcat-8.0-doc/config/cluster-sender.html Wed Dec 5
20:20:35 2012
@@ -0,0 +1,157 @@
+Apache Tomcat 8 Configuration Reference (8.0.0-dev)
- The Cluster Sender object
+.noPrint {display: none;}
+td#mainBody {width: 100%;}
+
+code {background-color:rgb(224,255,255);padding:0 0.1em;}
+code.attributeName, code.propertyName
{background-color:transparent;}
+
+.wrapped-source code { display: block; background-color:
transparent; }
+.wrapped-source div { margin: 0 0 0 1.25em; }
+.wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; }
+
+p.notice {
+border: 1px solid rgb(255, 0, 0);
+background-color: rgb(238, 238, 238);
+color: rgb(0, 51, 102);
+padding: 0.5em;
+margin: 1em 2em 1em 1em;
+}
+http://tomcat.apache.org/";>Apache
Tomcat 8Version 8.0.0-dev,
Dec 5 2012http://www.apache.org/";>LinksDocs HomeConfig Ref.
Homehttp://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsTop Level
ElementsServerServiceExecutorsExecuto
rConnectorsHTTPAJPContainersContextEngineHostClusterNested
ComponentsGlobal
ResourcesJarScannerListenersLoaderManagerRealmResourcesValveCluster
ElementsClusterManagerChannelChannel/M
embershipChannel/SenderChannel/ReceiverChannel/InterceptorValveDeployerClusterListenerOtherFilterSystem
propertiesThe Cluster Sender
objectTable
of Contents
+IntroductionConcurrent Parallel
DeliveryNested ElementsAttributesCommon Sender AttributesCommon Transport AttributesPooledParallelSender
Attributes
+Introduction
+
+ The channel sender component is responsible for delivering outgoing cluster
messages over the network.
+ In the default implementation,
org.apache.catalina.tribes.transport.ReplicationTransmitter,
+ the sender is a fairly empty shell with not much logic around a fairly
complex
+ component the implements the actual delivery mechanism.
+
+Concurrent Parallel
Delivery
+
+ In the default transport implementation,
org.apache.catalina.tribes.transport.nio.PooledParallelSender,
+ Apache Tribes implements what we like to call "Concurrent Parallel Delivery".
+ This means that we can send a message to more than one destination at the
same time(parallel), and
+ deliver two messages to the same destination at the same time(concurrent).
Combine these two and we have
+ "Concurrent Parallel Delivery".
+
+
+ When is this useful? The simplest example we can think of is when part of
your code is sending a 10MB message,
+ like a war file being deployed, and you need to push through a small 10KB
message, say a session being replicated,
+ you don't have to wait for the 10MB message to finish, as a separate thread
will push in the small message
+ transmission at the same time. Currently there is no interrupt, pause or
priority mechanism available, but check back soon.
+
+Nested
Elements
+
+ The nested element is is not required, by
encouraged, as this is where
+ you would set all the socket options for the outgoing messages. Please see
its attributes below.
+ There are two implementations, in a similar manner to the receiver, one is non-blocking
+ based and the other is built using blocking IO.
+ org.apache.catalina.tribes.transport.bio.PooledMultiSender is
the blocking implementation and
+ org.apache.catalina.tribes.transport.nio.PooledParallelSender.
+ Parallel delivery is not available for the blocking implementation due to
the fact that it is blocking a thread on sending data.
+
+Attributes
+ Common Sender
Attributes
+AttributeDescriptionclassName
+Required, only available implementation is
org.apache.catalina.tribes.transport.ReplicationTransmitter
+
+
+ Common Transport
Attributes
+AttributeDescriptionclassName
+Required, an implementation of the
org.apache.catalina.tribes.transport.MultiPointSender.
+Non-blocking implementation is
org.apache.catalina.tribes.transport.nio.PooledParallelSender
+Blocking implementation is
org.apache.catalina.tribes.transport.bio.PooledMultiSender
+ rxBufSize
+The receive buffer size on the socket.
+Default value is 25188 bytes.
+ txBufSize
+ The send buffer size on the socket.
+ Default value is 43800 bytes.
+ udpRxBufSize
+The receive buffer size on the datagram socket.
+Default value is 25188 bytes.
+ udpTxBufSize
+ The send buffer size on the datagram socket.
+ Defau
svn commit: r1417624 [11/38] - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ appdev/ appdev/sample/ appdev/sample/docs/ appdev/sample/src/ appdev/sample/src/mypackage/ appdev/sample/web/ appdev/s
Propchange: tomcat/site/trunk/docs/tomcat-8.0-doc/config/context.html
--
svn:eol-style = native
Propchange: tomcat/site/trunk/docs/tomcat-8.0-doc/config/context.html
--
svn:keywords = Author Date Id Revision
Added: tomcat/site/trunk/docs/tomcat-8.0-doc/config/engine.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.0-doc/config/engine.html?rev=1417624&view=auto
==
--- tomcat/site/trunk/docs/tomcat-8.0-doc/config/engine.html (added)
+++ tomcat/site/trunk/docs/tomcat-8.0-doc/config/engine.html Wed Dec 5
20:20:35 2012
@@ -0,0 +1,249 @@
+Apache Tomcat 8 Configuration Reference (8.0.0-dev)
- The Engine Container
+.noPrint {display: none;}
+td#mainBody {width: 100%;}
+
+code {background-color:rgb(224,255,255);padding:0 0.1em;}
+code.attributeName, code.propertyName
{background-color:transparent;}
+
+.wrapped-source code { display: block; background-color:
transparent; }
+.wrapped-source div { margin: 0 0 0 1.25em; }
+.wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; }
+
+p.notice {
+border: 1px solid rgb(255, 0, 0);
+background-color: rgb(238, 238, 238);
+color: rgb(0, 51, 102);
+padding: 0.5em;
+margin: 1em 2em 1em 1em;
+}
+http://tomcat.apache.org/";>Apache
Tomcat 8Version 8.0.0-dev,
Dec 5 2012http://www.apache.org/";>LinksDocs HomeConfig Ref.
Homehttp://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsTop Level
ElementsServerServiceExecutorsExecuto
rConnectorsHTTPAJPContainersContextEngineHostClusterNested
ComponentsGlobal
ResourcesJarScannerListenersLoaderManagerRealmResourcesValveCluster
ElementsClusterManagerChannelChannel/M
embershipChannel/SenderChannel/ReceiverChannel/InterceptorValveDeployerClusterListenerOtherFilterSystem
propertiesThe Engine ContainerTable of
Contents
+IntroductionAttributesCommon
AttributesStandard
ImplementationNested
ComponentsSpecial
FeaturesLoggingAccess LogsLifecycle ListenersRequest Filters
+Introduction
+
+ The Engine element represents the entire request
+ processing machinery associated with a particular Catalina
+ Service. It receives and processes
+ all requests from one or more Connectors,
+ and returns the completed response to the Connector for ultimate
+ transmission back to the client.
+
+ Exactly one Engine element MUST be nested inside
+ a Service element, following all of the
+ corresponding Connector elements associated with this Service.
+
+Attributes
+
+ Common
Attributes
+
+All implementations of Engine
+support the following attributes:
+
+AttributeDescriptionbackgroundProcessorDelay
+This value represents the delay in seconds between the
+invocation of the backgroundProcess method on this engine and
+its child containers, including all hosts and contexts.
+Child containers will not be invoked if their delay value is not
+negative (which would mean they are using their own processing
+thread). Setting this to a positive value will cause
+a thread to be spawn. After waiting the specified amount of time,
+the thread will invoke the backgroundProcess method on this engine
+and all its child containers. If not specified, the default value for
+this attribute is 10, which represent a 10 seconds delay.
+ className
+Java class name of the implementation to use. This class must
+implement the org.apache.catalina.Engine interface.
+If not specified, the standard value (defined below) will be used.
+ defaultHost
+The default host name, which identifies the
+Host that will process requests directed
+to host names on this server, but which are not configured in
+this configuration file. This name MUST match the name
+attributes of one of the Host elements
+nested immediately inside.
+ jvmRoute
+Identifier which must be used in load balancing scenarios to enable
+session affinity. The identifier, which must be unique across all
+Tomcat servers which participate in the cluster, will be appended to
+the generated session identifier, therefore allowing the front end
+proxy to always forward a particular session to the same Tomcat
+instance.
+ name
+Logical name of this Engine, used in log and error messages.
When
+using multiple Service elements in the same
+Server, each Engine MUST be assigned a unique
+name.
+ startStopThreads
+The number of threads this Engine will use to start
+
svn commit: r1417624 [32/38] - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ appdev/ appdev/sample/ appdev/sample/docs/ appdev/sample/src/ appdev/sample/src/mypackage/ appdev/sample/web/ appdev/s
Added: tomcat/site/trunk/docs/tomcat-8.0-doc/proxy-howto.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.0-doc/proxy-howto.html?rev=1417624&view=auto
==
--- tomcat/site/trunk/docs/tomcat-8.0-doc/proxy-howto.html (added)
+++ tomcat/site/trunk/docs/tomcat-8.0-doc/proxy-howto.html Wed Dec 5 20:20:35
2012
@@ -0,0 +1,159 @@
+Apache Tomcat 8 (8.0.0-dev) - Proxy Support
HOW-TO
+.noPrint {display: none;}
+td#mainBody {width: 100%;}
+
+code {background-color:rgb(224,255,255);padding:0 0.1em;}
+code.attributeName, code.propertyName
{background-color:transparent;}
+
+.wrapped-source code { display: block; background-color:
transparent; }
+.wrapped-source div { margin: 0 0 0 1.25em; }
+.wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; }
+
+p.notice {
+border: 1px solid rgb(255, 0, 0);
+background-color: rgb(238, 238, 238);
+color: rgb(0, 51, 102);
+padding: 0.5em;
+margin: 1em 2em 1em 1em;
+}
+http://tomcat.apache.org/";>Apache
Tomcat 8Version 8.0.0-dev,
Dec 5 2012http://www.apache.org/";>LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsUser
Guide1)
Introduction2) Setup3) First webapp4) Deployer5) Manager6)
Realms and AAA7) Security
Manager8) JNDI
Resources9) JDBC
DataSources10)
Classloading11) JSPs12) SSL13)
SSI14) CGI15) Proxy Support16) MBean Descriptor17) Default Servlet18) Clustering19) Load Balancer20) Connectors21)
Monitoring and Management22) Logging23)
>APR/Native24) Virtual
>Hosting25) Advanced IOhref="extras.html">26) Additional Componentshref="maven-jars.html">27) Mavenizedhref="security-howto.html">28) Security Considerationshref="windows-service-howto.html">29) Windows Servicehref="windows-auth-howto.html">30) Windows Authenticationhref="jdbc-pool.html">31) Tomcat's JDBC Poolhref="web-socket-howto.html">32)
>WebSocketReferencehref="RELEASE-NOTES.txt">Release Noteshref="config/index.html">Configurationhref="api/index.html">Tomcat Javadocshref="servletapi/index.html">Servlet Javadocshref="jspapi/index.html">JSP 2.2 JavadocsEL 2.2 Javadocshttp://tomcat.apache.org/connectors-doc/";>JK 1.2
DocumentationApache Tomcat
DevelopmentBuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions";>StatusDevelopersArchitectureFunctional Specs.TribesProxy
Support HOW-TOTable
of Contents
+IntroductionApache 1.3 Proxy SupportApache 2.0 Proxy Support
+Introduction
+
+Using standard configurations of Tomcat, web applications can ask for
+the server name and port number to which the request was directed for
+processing. When Tomcat is running standalone with the
+Coyote HTTP/1.1 Connector, it will generally
+report the server name specified in the request, and the port number on
+which the Connector is listening. The servlet API
+calls of interest, for this purpose, are:
+
+ServletRequest.getServerName(): Returns the host name of the
server to which the request was sent.
+ServletRequest.getServerPort(): Returns the host name of the
server to which the request was sent.
+ServletRequest.getLocalName(): Returns the host name of the
Internet Protocol (IP) interface on which the request was received.
+ServletRequest.getLocalPort(): Returns the Internet Protocol
(IP) port number of the interface on which the request was received.
+
+
+When you are running behind a proxy server (or a web server that is
+configured to behave like a proxy server), you will sometimes prefer to
+manage the values returned by these calls. In particular, you will
+generally want the port number to reflect that specified in the original
+request, not the one on which the Connector itself is
+listening. You can use the proxyName and proxyPort
+attributes on the element to configure
+these values.
+
+Proxy support can take many forms. The following sections describe
+proxy configurations for several common cases.
+
+Apache 1.3
Proxy Support
+
+Apache 1.3 supports an optional module (mod_proxy) that
+configures the web server to act as a proxy server. This can be used to
+forward requests for a particular web application to a Tomcat instance,
+without having to configure a web connector such as mod_jk.
+To accomplish this, you need to perform the following tasks:
+
+Configure your copy of Apache so that it includes the
+mod_proxy module. If you are building from source,
+the easiest way to do this is to include the
+--enable-module=proxy directive on the
+./configure command line.
+If not already added for you, make sure that you are loading the
+mod_proxy module at Apache startup time, by using the
+following directives in your httpd.conf file:
+
+LoadModule proxy_module {path-to-modules}/mod_proxy.so
+AddModule mod_proxy.c
+
+Include t
svn commit: r1417624 [35/38] - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ appdev/ appdev/sample/ appdev/sample/docs/ appdev/sample/src/ appdev/sample/src/mypackage/ appdev/sample/web/ appdev/s
Added: tomcat/site/trunk/docs/tomcat-8.0-doc/setup.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.0-doc/setup.html?rev=1417624&view=auto
==
--- tomcat/site/trunk/docs/tomcat-8.0-doc/setup.html (added)
+++ tomcat/site/trunk/docs/tomcat-8.0-doc/setup.html Wed Dec 5 20:20:35 2012
@@ -0,0 +1,165 @@
+Apache Tomcat 8 (8.0.0-dev) - Tomcat
Setup
+.noPrint {display: none;}
+td#mainBody {width: 100%;}
+
+code {background-color:rgb(224,255,255);padding:0 0.1em;}
+code.attributeName, code.propertyName
{background-color:transparent;}
+
+.wrapped-source code { display: block; background-color:
transparent; }
+.wrapped-source div { margin: 0 0 0 1.25em; }
+.wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; }
+
+p.notice {
+border: 1px solid rgb(255, 0, 0);
+background-color: rgb(238, 238, 238);
+color: rgb(0, 51, 102);
+padding: 0.5em;
+margin: 1em 2em 1em 1em;
+}
+http://tomcat.apache.org/";>Apache
Tomcat 8Version 8.0.0-dev,
Dec 5 2012http://www.apache.org/";>LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsUser
Guide1)
Introduction2) Setup3) First webapp4) Deployer5) Manager6)
Realms and AAA7) Security
Manager8) JNDI
Resources9) JDBC
DataSources10)
Classloading11) JSPs12) SSL13)
SSI14) CGI15) Proxy Support16) MBean Descriptor17) Default Servlet18) Clustering19) Load Balancer20) Connectors21)
Monitoring and Management22) Logging23)
>APR/Native24) Virtual
>Hosting25) Advanced IOhref="extras.html">26) Additional Componentshref="maven-jars.html">27) Mavenizedhref="security-howto.html">28) Security Considerationshref="windows-service-howto.html">29) Windows Servicehref="windows-auth-howto.html">30) Windows Authenticationhref="jdbc-pool.html">31) Tomcat's JDBC Poolhref="web-socket-howto.html">32)
>WebSocketReferencehref="RELEASE-NOTES.txt">Release Noteshref="config/index.html">Configurationhref="api/index.html">Tomcat Javadocshref="servletapi/index.html">Servlet Javadocshref="jspapi/index.html">JSP 2.2 JavadocsEL 2.2 Javadocshttp://tomcat.apache.org/connectors-doc/";>JK 1.2
DocumentationApache Tomcat
DevelopmentBuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions";>StatusDevelopersArchitectureFunctional Specs.TribesTomcat
SetupTable
of Contents
+IntroductionWindowsUnix
daemon
+Introduction
+
+ This document introduces several ways to set up Tomcat for running
+ on different platforms. Please note that some advanced setup issues
+ are not covered here: the full distribution (ZIP file or tarball)
+ includes a file called
+ RUNNING.txt which discusses these issues. We encourage you to refer
+ to it if the information below does not answer some of your questions.
+
+ Windows
+
+
+ Installing Tomcat on Windows can be done easily using the Windows
+ installer. Its interface and functionality is similar to other wizard
+ based installers, with only a few items of interest.
+
+
+
+
+Installation as a service: Tomcat will be
+installed as a Windows service no matter what setting is selected.
+Using the checkbox on the component page sets the service as "auto"
+startup, so that Tomcat is automatically started when Windows
+starts. For optimal security, the service should be run as a
+separate user, with reduced permissions (see the Windows Services
+administration tool and its documentation).
+Java location: The installer will provide a
default
+JRE to use to run the service. The installer uses the registry to
+determine the base path of a Java 6 or later JRE, including the JRE
+installed as part of the full JDK. When running on a 64-bit
+operating system, the installer will first look for a 64-bit JRE
and
+only look for a 32-bit JRE if a 64-bit JRE is not found. It is not
+mandatory to use the default JRE detected by the installer. Any
+installed Java 6 or later JRE (32-bit or 64-bit) may be used.
+Tray icon: When Tomcat is run as a service, there
+will not be any tray icon present when Tomcat is running. Note that
+when choosing to run Tomcat at the end of installation, the tray
+icon will be used even if Tomcat was installed as a service.
+Refer to the
+Windows Service HOW-TO
+for information on how to manage Tomcat as a Windows service.
+
+
+
+
+The installer will create shortcuts allowing starting and configuring
+ Tomcat. It is important to note that the Tomcat administration web
+ application c
svn commit: r1417624 [28/38] - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ appdev/ appdev/sample/ appdev/sample/docs/ appdev/sample/src/ appdev/sample/src/mypackage/ appdev/sample/web/ appdev/s
Added: tomcat/site/trunk/docs/tomcat-8.0-doc/logging.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-8.0-doc/logging.html?rev=1417624&view=auto
==
--- tomcat/site/trunk/docs/tomcat-8.0-doc/logging.html (added)
+++ tomcat/site/trunk/docs/tomcat-8.0-doc/logging.html Wed Dec 5 20:20:35 2012
@@ -0,0 +1,591 @@
+Apache Tomcat 8 (8.0.0-dev) - Logging in
Tomcat
+.noPrint {display: none;}
+td#mainBody {width: 100%;}
+
+code {background-color:rgb(224,255,255);padding:0 0.1em;}
+code.attributeName, code.propertyName
{background-color:transparent;}
+
+.wrapped-source code { display: block; background-color:
transparent; }
+.wrapped-source div { margin: 0 0 0 1.25em; }
+.wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; }
+
+p.notice {
+border: 1px solid rgb(255, 0, 0);
+background-color: rgb(238, 238, 238);
+color: rgb(0, 51, 102);
+padding: 0.5em;
+margin: 1em 2em 1em 1em;
+}
+http://tomcat.apache.org/";>Apache
Tomcat 8Version 8.0.0-dev,
Dec 5 2012http://www.apache.org/";>LinksDocs Homehttp://wiki.apache.org/tomcat/FAQ";>FAQUser CommentsUser
Guide1)
Introduction2) Setup3) First webapp4) Deployer5) Manager6)
Realms and AAA7) Security
Manager8) JNDI
Resources9) JDBC
DataSources10)
Classloading11) JSPs12) SSL13)
SSI14) CGI15) Proxy Support16) MBean Descriptor17) Default Servlet18) Clustering19) Load Balancer20) Connectors21)
Monitoring and Management22) Logging23)
>APR/Native24) Virtual
>Hosting25) Advanced IOhref="extras.html">26) Additional Componentshref="maven-jars.html">27) Mavenizedhref="security-howto.html">28) Security Considerationshref="windows-service-howto.html">29) Windows Servicehref="windows-auth-howto.html">30) Windows Authenticationhref="jdbc-pool.html">31) Tomcat's JDBC Poolhref="web-socket-howto.html">32)
>WebSocketReferencehref="RELEASE-NOTES.txt">Release Noteshref="config/index.html">Configurationhref="api/index.html">Tomcat Javadocshref="servletapi/index.html">Servlet Javadocshref="jspapi/index.html">JSP 2.2 JavadocsEL 2.2 Javadocshttp://tomcat.apache.org/connectors-doc/";>JK 1.2
DocumentationApache Tomcat
DevelopmentBuildingChangeloghttp://wiki.apache.org/tomcat/TomcatVersions";>StatusDevelopersArchitectureFunctional Specs.TribesLogging in
TomcatTable
of Contents
+IntroductionJava logging API —
java.util.loggingServlets logging
APIConsoleAccess loggingUsing java.util.logging
(default)Documentation
referencesConsiderations for productive
usageUsing Log4j
+Introduction
+
+ Logging in Apache Tomcat is implemented with the help of
+ http://commons.apache.org/logging";>Apache Commons Logging
+ library. That library is a thin wrapper above different logging
+ frameworks. It provides Tomcat with the ability to log
+ hierarchically across various log levels without the need to rely on a
+ particular logging implementation.
+
+
+
+ Since Tomcat 6.0, Tomcat uses a private package-renamed implementation of
+ Apache Commons Logging, to allow web applications to use their own
+ independent copies of the original Apache Commons Logging library.
+ In the default distribution this private copy of the library
+ is simplified and hardcoded to use the java.util.logging
framework.
+
+
+
+ To configure Tomcat to use alternative logging frameworks for its
internal
+ logging, one has to replace the logging library with the one that is
built
+ with the full implementation. Such library is provided as an extras
+ component. Instructions on how to configure Tomcat to use Log4j framework
+ for its internal logging may be found below.
+
+
+
+ A web application running on Apache Tomcat can:
+
+
+
+Use system logging API, java.util.logging.
+
+
+Use the logging API provided by the Java Servlets specification,
+javax.servlet.ServletContext.log(...)
+
+
+Use any logging framework of its choice.
+
+
+
+
+ The logging frameworks used by different web applications run
independently
+ of each other. See class loading
+ for more details.
+ The exception to this rule is java.util.logging, if it used
+ directly or indirectly by your logging library. That is because it is
loaded
+ by the system and is shared across web applications.
+
+
+Java logging API
— java.util.logging
+
+
+ Apache Tomcat has its own implementation of several key elements of
+ java.util.logging API. This implementation is called "JULI".
+ The key component there is a custom LogManager implementation,
+ that is aware of different web applications runni
svn commit: r1417661 - in /tomcat/site/trunk: docs/security-6.html xdocs/security-6.xml
Author: rjung Date: Wed Dec 5 21:51:32 2012 New Revision: 1417661 URL: http://svn.apache.org/viewvc?rev=1417661&view=rev Log: Fix version numbers. Modified: tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/xdocs/security-6.xml Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1417661&r1=1417660&r2=1417661&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Wed Dec 5 21:51:32 2012 @@ -412,7 +412,7 @@ made public on 4 December 2012. -Affects: 6.0.0-6.0.36 +Affects: 6.0.0-6.0.35 @@ -433,7 +433,7 @@ and made public on 4 December 2012. -Affects: 6.0.0-6.0.36 +Affects: 6.0.0-6.0.35 Modified: tomcat/site/trunk/xdocs/security-6.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1417661&r1=1417660&r2=1417661&view=diff == --- tomcat/site/trunk/xdocs/security-6.xml (original) +++ tomcat/site/trunk/xdocs/security-6.xml Wed Dec 5 21:51:32 2012 @@ -109,7 +109,7 @@ This issue was identified by the Tomcat security team on 13 July 2012 and made public on 4 December 2012. -Affects: 6.0.0-6.0.36 +Affects: 6.0.0-6.0.35 Important: Bypass of CSRF prevention filter CVE-2012-4431 @@ -123,7 +123,7 @@ This issue was identified by the Tomcat security team on 8 September 2012 and made public on 4 December 2012. -Affects: 6.0.0-6.0.36 +Affects: 6.0.0-6.0.35 Important: Denial of service CVE-2012-4534 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1422385 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/appdev/project.xml webapps/docs/architecture/project.xml webapps/docs/config/project.xml webapps/docs/funcspecs/project.xml webapps/doc
Author: rjung Date: Sat Dec 15 22:17:29 2012 New Revision: 1422385 URL: http://svn.apache.org/viewvc?rev=1422385&view=rev Log: Make docs menues consistent in the various levels. Backport of r1417463 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml tomcat/tc7.0.x/trunk/webapps/docs/funcspecs/project.xml tomcat/tc7.0.x/trunk/webapps/docs/project.xml tomcat/tc7.0.x/trunk/webapps/docs/tribes/project.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1417463 Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml?rev=1422385&r1=1422384&r2=1422385&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml Sat Dec 15 22:17:29 2012 @@ -29,6 +29,8 @@ + +http://wiki.apache.org/tomcat/FAQ"; /> Modified: tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml?rev=1422385&r1=1422384&r2=1422385&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml Sat Dec 15 22:17:29 2012 @@ -29,6 +29,8 @@ + +http://wiki.apache.org/tomcat/FAQ"; /> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml?rev=1422385&r1=1422384&r2=1422385&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml Sat Dec 15 22:17:29 2012 @@ -30,6 +30,7 @@ +http://wiki.apache.org/tomcat/FAQ"; /> Modified: tomcat/tc7.0.x/trunk/webapps/docs/funcspecs/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/funcspecs/project.xml?rev=1422385&r1=1422384&r2=1422385&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/funcspecs/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/funcspecs/project.xml Sat Dec 15 22:17:29 2012 @@ -29,6 +29,7 @@ +http://wiki.apache.org/tomcat/FAQ"; /> Modified: tomcat/tc7.0.x/trunk/webapps/docs/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/project.xml?rev=1422385&r1=1422384&r2=1422385&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/project.xml Sat Dec 15 22:17:29 2012 @@ -93,6 +93,7 @@ + Modified: tomcat/tc7.0.x/trunk/webapps/docs/tribes/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/tribes/project.xml?rev=1422385&r1=1422384&r2=1422385&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/tribes/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/tribes/project.xml Sat Dec 15 22:17:29 2012 @@ -27,6 +27,7 @@ + http://wiki.apache.org/tomcat/FAQ"; /> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1422387 - in /tomcat/tc7.0.x/trunk: ./ build.xml webapps/docs/tomcat-docs.xsl
Author: rjung
Date: Sat Dec 15 22:19:39 2012
New Revision: 1422387
URL: http://svn.apache.org/viewvc?rev=1422387&view=rev
Log:
Pass some more context information to style
sheet which generates docs. Will be used
when embedding the docs comments feature.
Backport of r1417465 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1417465
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1422387&r1=1422386&r2=1422387&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Sat Dec 15 22:19:39 2012
@@ -767,8 +767,11 @@
destdir="${tomcat.build}/webapps/docs"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="build.xml project.xml"
includes="*.xml">
+
+
@@ -778,8 +781,11 @@
destdir="${tomcat.build}/webapps/docs/appdev"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+
+
@@ -789,8 +795,11 @@
destdir="${tomcat.build}/webapps/docs/funcspecs"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+
+
@@ -800,8 +809,11 @@
destdir="${tomcat.build}/webapps/docs/config"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+
+
@@ -811,8 +823,11 @@
destdir="${tomcat.build}/webapps/docs/architecture"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+
+
@@ -823,8 +838,11 @@
destdir="${tomcat.build}/webapps/docs/tribes"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
+ filenameparameter="filename"
excludes="project.xml"
includes="*.xml">
+
+
Modified: tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1422387&r1=1422386&r2=1422387&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Sat Dec 15 22:19:39 2012
@@ -35,8 +35,10 @@
+
+
@@ -44,6 +46,8 @@
http://issues.apache.org/bugzilla/show_bug.cgi?id='"/>
http://svn.apache.org/viewvc?view=rev&rev='"/>
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1422388 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: rjung Date: Sat Dec 15 22:20:49 2012 New Revision: 1422388 URL: http://svn.apache.org/viewvc?rev=1422388&view=rev Log: Fix sitedir. Backport of r1417469 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1417469 Modified: tomcat/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1422388&r1=1422387&r2=1422388&view=diff == --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Sat Dec 15 22:20:49 2012 @@ -770,7 +770,7 @@ filenameparameter="filename" excludes="build.xml project.xml" includes="*.xml"> - + @@ -784,7 +784,7 @@ filenameparameter="filename" excludes="project.xml" includes="*.xml"> - + @@ -798,7 +798,7 @@ filenameparameter="filename" excludes="project.xml" includes="*.xml"> - + @@ -812,7 +812,7 @@ filenameparameter="filename" excludes="project.xml" includes="*.xml"> - + @@ -826,7 +826,7 @@ filenameparameter="filename" excludes="project.xml" includes="*.xml"> - + @@ -841,7 +841,7 @@ filenameparameter="filename" excludes="project.xml" includes="*.xml"> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1422389 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/tomcat-docs.xsl
Author: rjung
Date: Sat Dec 15 22:21:36 2012
New Revision: 1422389
URL: http://svn.apache.org/viewvc?rev=1422389&view=rev
Log:
Add a CSS style "notice".
Will be used for the docs comments feature.
Backport of r1417467 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1417467
Modified: tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1422389&r1=1422388&r2=1422389&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Sat Dec 15 22:21:36 2012
@@ -96,6 +96,15 @@
.wrapped-source div { margin: 0 0 0 1.25em; }
.wrapped-source p { margin: 0 0 0 1.25em; text-indent: -1.25em; }
+
+p.notice {
+border: 1px solid rgb(255, 0, 0);
+background-color: rgb(238, 238, 238);
+color: rgb(0, 51, 102);
+padding: 0.5em;
+margin: 1em 2em 1em 1em;
+}
+
svn commit: r1422392 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/ webapps/docs/appdev/ webapps/docs/architecture/ webapps/docs/config/ webapps/docs/funcspecs/ webapps/docs/tribes/
Author: rjung Date: Sat Dec 15 22:25:12 2012 New Revision: 1422392 URL: http://svn.apache.org/viewvc?rev=1422392&view=rev Log: Add user comments system to docs. Backport of r1417476 from trunk. Added: tomcat/tc7.0.x/trunk/webapps/docs/comments.xml - copied unchanged from r1417476, tomcat/trunk/webapps/docs/comments.xml Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml tomcat/tc7.0.x/trunk/webapps/docs/funcspecs/project.xml tomcat/tc7.0.x/trunk/webapps/docs/project.xml tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl tomcat/tc7.0.x/trunk/webapps/docs/tribes/project.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1417476 Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml?rev=1422392&r1=1422391&r2=1422392&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/project.xml Sat Dec 15 22:25:12 2012 @@ -31,6 +31,7 @@ http://wiki.apache.org/tomcat/FAQ"; /> + Modified: tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml?rev=1422392&r1=1422391&r2=1422392&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml Sat Dec 15 22:25:12 2012 @@ -31,6 +31,7 @@ http://wiki.apache.org/tomcat/FAQ"; /> + Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml?rev=1422392&r1=1422391&r2=1422392&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/project.xml Sat Dec 15 22:25:12 2012 @@ -31,6 +31,7 @@ http://wiki.apache.org/tomcat/FAQ"; /> + Modified: tomcat/tc7.0.x/trunk/webapps/docs/funcspecs/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/funcspecs/project.xml?rev=1422392&r1=1422391&r2=1422392&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/funcspecs/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/funcspecs/project.xml Sat Dec 15 22:25:12 2012 @@ -30,6 +30,7 @@ http://wiki.apache.org/tomcat/FAQ"; /> + Modified: tomcat/tc7.0.x/trunk/webapps/docs/project.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/project.xml?rev=1422392&r1=1422391&r2=1422392&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/project.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/project.xml Sat Dec 15 22:25:12 2012 @@ -30,6 +30,7 @@ http://wiki.apache.org/tomcat/FAQ"; /> + Modified: tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1422392&r1=1422391&r2=1422392&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Sat Dec 15 22:25:12 2012 @@ -61,6 +61,7 @@ + /comments.html @@ -172,6 +173,53 @@ + + + + + + + + + +Comments + + + + + + + Notice: This is not a Q&A section. + The Apache Comments System is explained + here. + Comments should be pointed towards suggestions on improving the documentation + or server, and may be removed again by our moderators if they are either + implemented or considered invalid/off-topic. + Questions on how to manage Apache Tomcat should be directed + to our http://tomcat.apache.org/lists.html";>mailing lists. +
svn commit: r1422396 - /tomcat/site/trunk/docs/tomcat-8.0-doc/
Author: rjung Date: Sat Dec 15 22:45:04 2012 New Revision: 1422396 URL: http://svn.apache.org/viewvc?rev=1422396&view=rev Log: Drop temporary TC 8 docs from site. Those docs were not linked and only used as a comments system testbed. Removed: tomcat/site/trunk/docs/tomcat-8.0-doc/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1429348 - in /tomcat/jk/trunk: jkstatus/build.xml native/NOTICE native/common/jk_status.c native/iis/jk_isapi_plugin.c xdocs/style.xsl
Author: rjung Date: Sat Jan 5 18:09:04 2013 New Revision: 1429348 URL: http://svn.apache.org/viewvc?rev=1429348&view=rev Log: Again another year. Modified: tomcat/jk/trunk/jkstatus/build.xml tomcat/jk/trunk/native/NOTICE tomcat/jk/trunk/native/common/jk_status.c tomcat/jk/trunk/native/iis/jk_isapi_plugin.c tomcat/jk/trunk/xdocs/style.xsl Modified: tomcat/jk/trunk/jkstatus/build.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/jkstatus/build.xml?rev=1429348&r1=1429347&r2=1429348&view=diff == --- tomcat/jk/trunk/jkstatus/build.xml (original) +++ tomcat/jk/trunk/jkstatus/build.xml Sat Jan 5 18:09:04 2013 @@ -120,7 +120,7 @@ version="true" windowtitle="Jk Status Internal API Documentation" doctitle="Jk Status API" - bottom="Copyright © 2000-2012 Apache Software Foundation. All Rights Reserved." + bottom="Copyright © 2000-2013 Apache Software Foundation. All Rights Reserved." /> Modified: tomcat/jk/trunk/native/NOTICE URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/NOTICE?rev=1429348&r1=1429347&r2=1429348&view=diff == --- tomcat/jk/trunk/native/NOTICE (original) +++ tomcat/jk/trunk/native/NOTICE Sat Jan 5 18:09:04 2013 @@ -1,5 +1,5 @@ Apache Tomcat Connectors -Copyright 2002-2012 The Apache Software Foundation +Copyright 2002-2013 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). Modified: tomcat/jk/trunk/native/common/jk_status.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1429348&r1=1429347&r2=1429348&view=diff == --- tomcat/jk/trunk/native/common/jk_status.c (original) +++ tomcat/jk/trunk/native/common/jk_status.c Sat Jan 5 18:09:04 2013 @@ -215,7 +215,7 @@ "http://www.w3.org/1999/xhtml\"; xml:lang=\"en\" lang=\"en\">" \ "JK Status Manager" -#define JK_STATUS_COPYRIGHT"Copyright © 1999-2012, The Apache Software Foundation" \ +#define JK_STATUS_COPYRIGHT"Copyright © 1999-2013, The Apache Software Foundation" \ "Licensed under the http://www.apache.org/licenses/LICENSE-2.0\";>" \ "Apache License, Version 2.0." Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1429348&r1=1429347&r2=1429348&view=diff == --- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original) +++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sat Jan 5 18:09:04 2013 @@ -208,7 +208,7 @@ char HTML_ERROR_TAIL[] ="\n \n" "\n" "\n" -"Copyright © 1999-2012 Apache Software Foundation\n" +"Copyright © 1999-2013 Apache Software Foundation\n" "All Rights Reserved\n" "\n\n\n"; Modified: tomcat/jk/trunk/xdocs/style.xsl URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/style.xsl?rev=1429348&r1=1429347&r2=1429348&view=diff == --- tomcat/jk/trunk/xdocs/style.xsl (original) +++ tomcat/jk/trunk/xdocs/style.xsl Sat Jan 5 18:09:04 2013 @@ -178,7 +178,7 @@ PAGE FOOTER -Copyright © 1999-2012, Apache Software Foundation +Copyright © 1999-2013, Apache Software Foundation - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1431990 - /tomcat/trunk/test/org/apache/el/util/Tester.java
Author: rjung
Date: Fri Jan 11 11:08:17 2013
New Revision: 1431990
URL: http://svn.apache.org/viewvc?rev=1431990&view=rev
Log:
Remove svn:executable property from Tester.java.
Modified:
tomcat/trunk/test/org/apache/el/util/Tester.java (props changed)
Propchange: tomcat/trunk/test/org/apache/el/util/Tester.java
('svn:executable' removed)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1431991 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/el/util/Tester.java
Author: rjung
Date: Fri Jan 11 11:09:13 2013
New Revision: 1431991
URL: http://svn.apache.org/viewvc?rev=1431991&view=rev
Log:
Remove svn:executable property from Tester.java.
Backport of r1431990 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/el/util/Tester.java (props changed)
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1431990
Propchange: tomcat/tc7.0.x/trunk/test/org/apache/el/util/Tester.java
('svn:executable' removed)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439054 - /tomcat/trunk/webapps/docs/appdev/deployment.xml
Author: rjung Date: Sun Jan 27 11:31:14 2013 New Revision: 1439054 URL: http://svn.apache.org/viewvc?rev=1439054&view=rev Log: Close parentheses on docs page. Noted on comments.a.o. Modified: tomcat/trunk/webapps/docs/appdev/deployment.xml Modified: tomcat/trunk/webapps/docs/appdev/deployment.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/deployment.xml?rev=1439054&r1=1439053&r2=1439054&view=diff == --- tomcat/trunk/webapps/docs/appdev/deployment.xml (original) +++ tomcat/trunk/webapps/docs/appdev/deployment.xml Sun Jan 27 11:31:14 2013 @@ -124,7 +124,7 @@ API Specification, version 2.3, which yo Like most servlet containers, Tomcat also supports mechanisms to install library JAR files (or unpacked classes) once, and make them visible to all installed web applications (without having to be included inside the web -application itself. The details of how Tomcat locates and shares such +application itself). The details of how Tomcat locates and shares such classes are described in the Class Loader HOW-TO documentation. The location commonly used within a Tomcat installation for shared code is - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439055 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/appdev/deployment.xml
Author: rjung Date: Sun Jan 27 11:37:32 2013 New Revision: 1439055 URL: http://svn.apache.org/viewvc?rev=1439055&view=rev Log: Close parentheses on docs page. Noted on comments.a.o. Backport of r1439054 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1439054 Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml?rev=1439055&r1=1439054&r2=1439055&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml Sun Jan 27 11:37:32 2013 @@ -124,7 +124,7 @@ API Specification, version 2.3, which yo Like most servlet containers, Tomcat also supports mechanisms to install library JAR files (or unpacked classes) once, and make them visible to all installed web applications (without having to be included inside the web -application itself. The details of how Tomcat locates and shares such +application itself). The details of how Tomcat locates and shares such classes are described in the Class Loader HOW-TO documentation. The location commonly used within a Tomcat installation for shared code is - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439058 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/appdev/deployment.xml
Author: rjung Date: Sun Jan 27 11:44:41 2013 New Revision: 1439058 URL: http://svn.apache.org/viewvc?rev=1439058&view=rev Log: Close parentheses on docs page. Noted on comments.a.o. Backport of r1439054 from trunk resp. r1439055 ffrom tc7. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1439054 Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml?rev=1439058&r1=1439057&r2=1439058&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/deployment.xml Sun Jan 27 11:44:41 2013 @@ -124,7 +124,7 @@ API Specification, version 2.3, which yo Like most servlet containers, Tomcat 6 also supports mechanisms to install library JAR files (or unpacked classes) once, and make them visible to all installed web applications (without having to be included inside the web -application itself. The details of how Tomcat locates and shares such +application itself). The details of how Tomcat locates and shares such classes are described in the Class Loader HOW-TO documentation. The location commonly used within a Tomcat 6 installation for shared code is - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1439335 - /tomcat/native/trunk/native/os/unix/system.c
Author: rjung
Date: Mon Jan 28 10:34:27 2013
New Revision: 1439335
URL: http://svn.apache.org/viewvc?rev=1439335&view=rev
Log:
Add CPU information to OS info for Linux.
This was already available under Windows and Solaris.
Forward port of r1350339 from 1.1.x branch.
Modified:
tomcat/native/trunk/native/os/unix/system.c
Modified: tomcat/native/trunk/native/os/unix/system.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/unix/system.c?rev=1439335&r1=1439334&r2=1439335&view=diff
==
--- tomcat/native/trunk/native/os/unix/system.c (original)
+++ tomcat/native/trunk/native/os/unix/system.c Mon Jan 28 10:34:27 2013
@@ -127,6 +127,15 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
if (sysinfo(&info))
rv = apr_get_os_error();
else {
+static char buf[1024];
+unsigned long user = 0;
+unsigned long system = 0;
+long idle = 0;
+long long starttime = 0;
+int fd;
+int len;
+long sys_clk_tck = sysconf(_SC_CLK_TCK); /* number of system ticks
per second */
+
pvals[0] = (jlong)(info.totalram * info.mem_unit);
pvals[1] = (jlong)(info.freeram * info.mem_unit);
pvals[2] = (jlong)(info.totalswap * info.mem_unit);
@@ -134,6 +143,54 @@ TCN_IMPLEMENT_CALL(jint, OS, info)(TCN_S
pvals[4] = (jlong)(info.sharedram * info.mem_unit);
pvals[5] = (jlong)(info.bufferram * info.mem_unit);
pvals[6] = (jlong)(100 - (info.freeram * 100 / info.totalram));
+
+if (sys_clk_tck >= 0) {
+/* Get total CPU times from /proc/stat */
+/* Example for the first line: cpu 2095497 8176 3280198
908667841 1543576 28867 375399 0 0 */
+/* Accoring to the man pages, the numbers are given in units
of USER_HZ:
+ * user mode, user mode with low priority (nice), system mode,
and the idle task.
+ * Additional values can be ignored. */
+fd = open("/proc/stat", O_RDONLY);
+if (fd != -1) {
+len = read(fd, buf, sizeof buf - 1);
+if (len > 0) {
+buf[len] = '\0';
+if (sscanf(buf, "cpu %lu %*d %lu %ld", &user, &system,
&idle) == 3) {
+pvals[7] = (jlong)(idle * 1000 / sys_clk_tck *
1000); /* Idle Time in microseconds */
+pvals[8] = (jlong)(system * 1000 / sys_clk_tck *
1000); /* Kernel Time in microseconds */
+pvals[9] = (jlong)(user * 1000 / sys_clk_tck *
1000); /* User Time in microseconds */
+}
+}
+close(fd);
+}
+/* Get process CPU times from /proc/self/stat */
+/* Example for the first line:
+ * 6309 (csh) S 6308 6309 6309 34816 7124 4202496 15119 252261
1 30 21 58 1537 1447 20 0 1 0 916031966 ... */
+/* Parsing it according to man -s 5 proci:
+ * pid %d, comm %s, state %c, ppid %d pgrp %d, session %d,
tty_nr %d, tpgid %d, flags %u,
+ * minflt %lu, cminflt %lu, majflt %lu, cmajflt %lu,
+ * utime %lu (!), stime %lu (!), cutime %ld (!), cstime %ld
(!),
+ * priority %ld, nice %ld, num_threads %ld, itrealvalue %ld,
+ * starttime %llu (!) */
+fd = open("/proc/self/stat", O_RDONLY);
+if (fd != -1) {
+len = read(fd, buf, sizeof buf - 1);
+if (len > 0) {
+buf[len] = '\0';
+if (sscanf(buf, "%*d %*s %*c %*d %*d %*d %*d %*d %*u"
+" %*u %*u %*u %*u"
+" %lu %lu %*d %*d"
+" %*d %*d %*d %*d"
+"%llu", &user, &system, &starttime) ==
3) {
+pvals[10] = (jlong)(apr_time_now() -
apr_time_make(info.uptime - starttime / sys_clk_tck, 0)); /* Process creation
time (apr_time_t) */
+pvals[11] = (jlong)(system * 1000 / sys_clk_tck *
1000); /* Process System Time in microseconds */
+pvals[12] = (jlong)(user * 1000 / sys_clk_tck *
1000); /* Process User Time in microseconds */
+}
+}
+close(fd);
+}
+}
+
rv = APR_SUCCESS;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
