Re: svn commit: r1094069 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/manager/ java/org/apache/catalina/session/ webapps/docs/
On Sat, 2011-04-16 at 22:25 +, ma...@apache.org wrote: > Author: markt > Date: Sat Apr 16 22:25:28 2011 > New Revision: 1094069 > > URL: http://svn.apache.org/viewvc?rev=1094069&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51042 > Don't trigger session creation listeners when changing the session ID during > authentication. But the listeners have to be aware that the id changed. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1094069 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/manager/ java/org/apache/catalina/session/ webapps/docs/
On 18/04/2011 02:43, Keiichi Fujino wrote: > A primary node is never notified to the listener when changing the > session ID during authentication. > Should I not notify the listener if non-primary node receives > EVT_CHANGE_SESSION_ID? My own view is that a session ID change (from authentication, from a jvmRoute change or from anything else) should not trigger a notification to any session listeners. However, that may not be the community view. Remy started a discussion on this elsewhere in this thread. I'll respond to that and I think we should see what the conclusion is before making any more changes. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1094069 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/manager/ java/org/apache/catalina/session/ webapps/docs/
On 18/04/2011 10:13, Remy Maucherat wrote: > On Sat, 2011-04-16 at 22:25 +, ma...@apache.org wrote: >> Author: markt >> Date: Sat Apr 16 22:25:28 2011 >> New Revision: 1094069 >> >> URL: http://svn.apache.org/viewvc?rev=1094069&view=rev >> Log: >> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51042 >> Don't trigger session creation listeners when changing the session ID during >> authentication. > > But the listeners have to be aware that the id changed. Why? I have checked the Servlet spec and I don't see any event defined for "session ID changed". I also don't see anything (although I may have missed it) that says the ID must be constant. It Tomcat treats changing the ID as "session invalidated" followed by "session created" then the listeners would need to be notified (for both events) but that raises additional questions about events for object binding and attribute changes - all those events should probably be triggered as well since the attributes are essentially being removed from the old session and added to the new. That could be an expensive and unnecessary process for some applications. The previous behaviour only triggered a session created event for the new session ID. There was no corresponding session destroyed event for the old session ID. Regardless of whether we decide that events are required or not, the previous behaviour was wrong. My preference is to keep things simple and not trigger any events when the ID changes. Sessions aren't being invalidated or created so I think firing those events is more likely to cause problems for applications than not firing them. To date (AFAIR), there has been one issue reported on the users list (changing ID broke a Java applet - fixed by not changing the ID on authentication) and one bug (that session created is fired but not session destroyed - that triggered this fix). Once we agree on how to handle this, we need to make sure all session id changes (authentication, jvmRoute changes) are handled the same way. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1094485 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Author: markt
Date: Mon Apr 18 11:02:39 2011
New Revision: 1094485
URL: http://svn.apache.org/viewvc?rev=1094485&view=rev
Log:
Stop trying to check for >0ms processing time in access log. There are other
tests that check for correct operation so no need for this.
Hopefully address last remaining Gump failure
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1094485&r1=1094484&r2=1094485&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Mon
Apr 18 11:02:39 2011
@@ -353,15 +353,6 @@ public class TestAsyncContextImpl extend
final HttpServletResponse resp)
throws ServletException, IOException {
-// Ensure the request takes more than 0 ms to process
-// 0ms processing time in access log usually indicates an error
-try {
-Thread.sleep(1);
-} catch (InterruptedException ie) {
-// Should never happen
-throw new IOException(ie);
-}
-
AsyncContext actxt = req.startAsync();
actxt.setTimeout(3000);
resp.setContentType("text/plain");
@@ -556,15 +547,6 @@ public class TestAsyncContextImpl extend
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
-// Ensure the request takes more than 0 ms to process
-// 0ms processing time in access log usually indicates an error
-try {
-Thread.sleep(1);
-} catch (InterruptedException ie) {
-// Should never happen
-throw new IOException(ie);
-}
-
resp.getWriter().write("DispatchingServletGet-");
resp.flushBuffer();
final int iter = Integer.parseInt(req.getParameter(ITER_PARAM)) -
1;
@@ -1054,9 +1036,9 @@ public class TestAsyncContextImpl extend
int status, long minTime, long maxTime) throws Exception {
List entries = alv.getEntries();
-// Assume one entry - wait until it appears (access log entry will be
-// made after response has been returned to user)
-for (int i = 0; i < 10 && entries.size() == 0; i++) {
+// Wait (but not too long) until all expected entries appear (access
log
+// entry will be made after response has been returned to user)
+for (int i = 0; i < 10 && entries.size() < count; i++) {
Thread.sleep(100);
}
@@ -1064,13 +1046,7 @@ public class TestAsyncContextImpl extend
for (int j = 0; j < count; j++) {
Entry entry = entries.get(j);
assertEquals(status, entry.getStatus());
-// A 0ms entry in the access log normally indicates a processing
-// error and we don't expect any of those for 200 responses
-if (minTime == 0 && status == 200) {
-assertTrue(entry.toString(), entry.getTime() > minTime);
-} else {
-assertTrue(entry.toString(), entry.getTime() >= minTime);
-}
+assertTrue(entry.toString(), entry.getTime() >= minTime);
assertTrue(entry.toString(), entry.getTime() < maxTime);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1094490 - /tomcat/trunk/webapps/docs/config/context.xml
Author: markt Date: Mon Apr 18 11:19:16 2011 New Revision: 1094490 URL: http://svn.apache.org/viewvc?rev=1094490&view=rev Log: Add note that antiJARLocking and antiResourceLocking should not be used together. Line length Modified: tomcat/trunk/webapps/docs/config/context.xml Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1094490&r1=1094489&r2=1094490&view=diff == --- tomcat/trunk/webapps/docs/config/context.xml (original) +++ tomcat/trunk/webapps/docs/config/context.xml Mon Apr 18 11:19:16 2011 @@ -529,9 +529,14 @@ If true, the Tomcat classloader will take extra measures to avoid JAR file locking when resources are accessed inside JARs through URLs. -This will impact startup time of applications, but could prove to be useful -on platforms or configurations where file locking can occur. +This will impact startup time of applications, but could prove to be +useful on platforms or configurations where file locking can occur. If not specified, the default value is false. + +antiJARLocking is a subset of +antiResourceLocking and therefore, to prevent duplicate +work and possible issues, only one of these attributes should be set +to true at any one time. @@ -541,19 +546,22 @@ or configurations where file locking can occur. If not specified, the default value is false. -Please note that setting this to true has some side effects, -including the disabling of JSP reloading in a running server: see -http://issues.apache.org/bugzilla/show_bug.cgi?id=37668";>Bugzilla 37668. - +antiJARLocking is a subset of +antiResourceLocking and therefore, to prevent duplicate +work and possible issues, only one of these attributes should be set +to true at any one time. + +Please note that setting this to true has some side +effects, including the disabling of JSP reloading in a running server: +see http://issues.apache.org/bugzilla/show_bug.cgi?id=37668";> +Bugzilla 37668. - -Please note that setting this flag to true in applications that are +Please note that setting this flag to true in applications that are outside the appBase for the Host (the webapps directory -by default) will cause the application to be -deleted on Tomcat shutdown. You probably don't want to -do this, so think twice before setting antiResourceLocking=true on a webapp -that's outside the appBase for its Host. - +by default) will cause the application to be deleted on +Tomcat shutdown. You probably don't want to do this, so think twice +before setting antiResourceLocking=true on a webapp that's outside the +appBase for its Host. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1094491 - /tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
Author: markt Date: Mon Apr 18 11:19:47 2011 New Revision: 1094491 URL: http://svn.apache.org/viewvc?rev=1094491&view=rev Log: Add note that antiJARLocking and antiResourceLocking should not be used together. Line length Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=1094491&r1=1094490&r2=1094491&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Mon Apr 18 11:19:47 2011 @@ -300,9 +300,14 @@ If true, the Tomcat classloader will take extra measures to avoid JAR file locking when resources are accessed inside JARs through URLs. -This will impact startup time of applications, but could prove to be useful -on platforms or configurations where file locking can occur. +This will impact startup time of applications, but could prove to be +useful on platforms or configurations where file locking can occur. If not specified, the default value is false. + +antiJARLocking is a subset of +antiResourceLocking and therefore, to prevent duplicate +work and possible issues, only one of these attributes should be set +to true at any one time. @@ -312,19 +317,22 @@ or configurations where file locking can occur. If not specified, the default value is false. -Please note that setting this to true has some side effects, -including the disabling of JSP reloading in a running server: see -http://issues.apache.org/bugzilla/show_bug.cgi?id=37668";>Bugzilla 37668. - +antiJARLocking is a subset of +antiResourceLocking and therefore, to prevent duplicate +work and possible issues, only one of these attributes should be set +to true at any one time. + +Please note that setting this to true has some side +effects, including the disabling of JSP reloading in a running server: +see http://issues.apache.org/bugzilla/show_bug.cgi?id=37668";> +Bugzilla 37668. - -Please note that setting this flag to true in applications that are +Please note that setting this flag to true in applications that are outside the appBase for the Host (the webapps directory -by default) will cause the application to be -deleted on Tomcat shutdown. You probably don't want to -do this, so think twice before setting antiResourceLocking=true on a webapp -that's outside the appBase for its Host. - +by default) will cause the application to be deleted on +Tomcat shutdown. You probably don't want to do this, so think twice +before setting antiResourceLocking=true on a webapp that's outside the +appBase for its Host. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1094492 - /tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml
Author: markt Date: Mon Apr 18 11:20:02 2011 New Revision: 1094492 URL: http://svn.apache.org/viewvc?rev=1094492&view=rev Log: Add note that antiJARLocking and antiResourceLocking should not be used together. Line length Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml?rev=1094492&r1=1094491&r2=1094492&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/context.xml Mon Apr 18 11:20:02 2011 @@ -274,9 +274,14 @@ If true, the Tomcat classloader will take extra measures to avoid JAR file locking when resources are accessed inside JARs through URLs. -This will impact startup time of applications, but could prove to be useful -on platforms or configurations where file locking can occur. +This will impact startup time of applications, but could prove to be +useful on platforms or configurations where file locking can occur. If not specified, the default value is false. + +antiJARLocking is a subset of +antiResourceLocking and therefore, to prevent duplicate +work and possible issues, only one of these attributes should be set +to true at any one time. @@ -286,18 +291,22 @@ or configurations where file locking can occur. If not specified, the default value is false. -Please note that setting this to true has some side effects, -including the disabling of JSP reloading in a running server: see -http://issues.apache.org/bugzilla/show_bug.cgi?id=37668";>Bugzilla 37668. - - -Please note that setting this flag to true in applications that are +antiJARLocking is a subset of +antiResourceLocking and therefore, to prevent duplicate +work and possible issues, only one of these attributes should be set +to true at any one time. + +Please note that setting this to true has some side +effects, including the disabling of JSP reloading in a running server: +see http://issues.apache.org/bugzilla/show_bug.cgi?id=37668";> +Bugzilla 37668. + +Please note that setting this flag to true in applications that are outside the appBase for the Host (the webapps directory -by default) will cause the application to be -deleted on Tomcat shutdown. You probably don't want to -do this, so think twice before setting antiResourceLocking=true on a webapp -that's outside the appBase for its Host. - +by default) will cause the application to be deleted on +Tomcat shutdown. You probably don't want to do this, so think twice +before setting antiResourceLocking=true on a webapp that's outside the +appBase for its Host. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1094569 - in /tomcat/trunk: java/org/apache/jasper/servlet/JspServlet.java webapps/docs/changelog.xml
Author: markt
Date: Mon Apr 18 13:41:37 2011
New Revision: 1094569
URL: http://svn.apache.org/viewvc?rev=1094569&view=rev
Log:
Correct a regression in the fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=49916 that resulted in JSPs
being compiled twice rather than just once.
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1094569&r1=1094568&r2=1094569&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Mon Apr 18
13:41:37 2011
@@ -125,7 +125,6 @@ public class JspServlet extends HttpServ
throw new ServletException("Can not locate jsp file", e);
}
try {
-serviceJspFile(null, null, jspFile, null, true);
if (SecurityUtil.isPackageProtectionEnabled()){
AccessController.doPrivileged(new
PrivilegedExceptionAction(){
@Override
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1094569&r1=1094568&r2=1094569&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Apr 18 13:41:37 2011
@@ -100,6 +100,10 @@
Label JSP/tag file line and column numbers when reporting errors since
it may not be immediately obvious what the numbers represent. (markt)
+
+Correct a regression in the fix for 49916 that resulted in
+JSPs being compiled twice rather than just once. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1094577 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/ELFunctionMapper.java webapps/docs/changelog.xml
Author: markt Date: Mon Apr 18 13:57:01 2011 New Revision: 1094577 URL: http://svn.apache.org/viewvc?rev=1094577&view=rev Log: Don't initialize classes during compilation http://svn.apache.org/viewvc?rev=1079801&view=rev Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 13:57:01 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070420,1070609,1072042,1075458,1076212,1078412 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,7289
DO NOT REPLY [Bug 50895] JSP compiler initializes classes during compile which can result in failures
https://issues.apache.org/bugzilla/show_bug.cgi?id=50895 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #8 from Mark Thomas 2011-04-18 09:57:13 EDT --- Fixed in 6.0.x and will be in 6.0.33 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1094580 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml webapps/docs/changelog.xml
Author: markt Date: Mon Apr 18 14:00:33 2011 New Revision: 1094580 URL: http://svn.apache.org/viewvc?rev=1094580&view=rev Log: Fix timestamp when using version.[sh|bat] Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.xml 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=1094580&r1=1094579&r2=1094580&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Apr 18 14:00:33 2011 @@ -139,15 +139,6 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, kkolinko -1: -* Fix timestamp when using version.[sh|bat] - The problem is that version.bat in 6.0.32 displays - "Server built: February 2 2011 2003" instead of "Feb 2 2011 20:03" - because of the default format of DSTAMP, TSTAMP and TODAY properties. - See http://ant.apache.org/manual/Tasks/tstamp.html - http://people.apache.org/~markt/patches/2011-03-14-serverinfo-tc6.patch - +1: markt, kkolinko, kfujino - -1: - * Remove unnecessary whitespace from MIME mapping entries in default web.xml http://svn.apache.org/viewvc?rev=1081334&view=rev +1: markt, kkolinko, kfujino Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1094580&r1=1094579&r2=1094580&view=diff == --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Mon Apr 18 14:00:33 2011 @@ -37,9 +37,7 @@ - - - + @@ -102,6 +100,7 @@ + Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1094580&r1=1094579&r2=1094580&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Apr 18 14:00:33 2011 @@ -81,6 +81,9 @@ 50855: Fix NPE on AuthenticatorBase.register() when debug logging is enabled. (markt) + +Correctly format the timestamp reported by version.[sh|bat]. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1094582 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt conf/web.xml webapps/docs/changelog.xml
Author: markt Date: Mon Apr 18 14:04:17 2011 New Revision: 1094582 URL: http://svn.apache.org/viewvc?rev=1094582&view=rev Log: Remove unnecessary whitespace from MIME mapping entries in default web.xml Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/conf/web.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 14:04:17 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070420,1070609,1072042,1075458,1076212,1078412,1079801 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,
svn commit: r1094584 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml
Author: markt
Date: Mon Apr 18 14:07:18 2011
New Revision: 1094584
URL: http://svn.apache.org/viewvc?rev=1094584&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49180
Add option to disable log rotation in juli FileHandler
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.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=1094584&r1=1094583&r2=1094584&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Apr 18 14:07:18 2011
@@ -144,12 +144,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49180
- Add option to disable log rotation in juli FileHandler
- https://issues.apache.org/bugzilla/attachment.cgi?id=26844
- +1: kkolinko, markt, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47880
Clarify error messages in *.sh files to mention that if a script is not
found it might be because execute permission is needed.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java?rev=1094584&r1=1094583&r2=1094584&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java Mon Apr 18
14:07:18 2011
@@ -50,6 +50,11 @@ import java.util.logging.SimpleFormatter
*specify an absolute path for this property,
*${catalina.base}/logs
*Default value: logs
+ * rotatable - If true, the log file will be
+ *rotated on the first write past midnight and the filename will be
+ *{prefix}{date}{suffix}, where date is -MM-dd. If
false,
+ *the file will not be rotated and the filename will be
{prefix}{suffix}.
+ *Default value: true
* prefix - The leading part of the log file name.
*Default value: juli.
* suffix - The trailing part of the log file name. Default
value: .log
@@ -124,6 +129,12 @@ public class FileHandler
/**
+ * Determines whether the logfile is rotatable
+ */
+private boolean rotatable = true;
+
+
+/**
* The PrintWriter to which we are currently logging, if any.
*/
private volatile PrintWriter writer = null;
@@ -162,7 +173,7 @@ public class FileHandler
writerLock.readLock().lock();
// If the date has changed, switch log files
-if (!date.equals(tsDate)) {
+if (rotatable && !date.equals(tsDate)) {
// Update to writeLock before we switch
writerLock.readLock().unlock();
writerLock.writeLock().lock();
@@ -271,6 +282,7 @@ public class FileHandler
ClassLoader cl = Thread.currentThread().getContextClassLoader();
// Retrieve configuration of logging file name
+rotatable = Boolean.parseBoolean(getProperty(className + ".rotatable",
"true"));
if (directory == null)
directory = getProperty(className + ".directory", "logs");
if (prefix == null)
@@ -352,7 +364,7 @@ public class FileHandler
writerLock.writeLock().lock();
try {
String pathname = dir.getAbsolutePath() + File.separator +
-prefix + date + suffix;
+prefix + (rotatable ? date : "") + suffix;
String encoding = getEncoding();
FileOutputStream fos = new FileOutputStream(pathname, true);
OutputStream os = bufferSize>0?new
BufferedOutputStream(fos,bufferSize):fos;
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1094584&r1=1094583&r2=1094584&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Apr 18 14:07:18 2011
@@ -88,6 +88,10 @@
Remove unnecessary whitespace from MIME mapping entries in global
web.xml file. (markt)
+
+49180: Add an option to disable file rotation in JULI
+FileHandler. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49180] Add option to disable log rotation in FileHandler.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49180 --- Comment #4 from Mark Thomas 2011-04-18 10:07:33 EDT --- Fixed in 6.0.x and will be included in 6.0.33 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1094587 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/changelog.xml
Author: markt Date: Mon Apr 18 14:21:58 2011 New Revision: 1094587 URL: http://svn.apache.org/viewvc?rev=1094587&view=rev Log: Implement display of multiple request headers in AccessLogValve (kkolinko) Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 14:21:58 2011 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1067039,1067139,1069824,1070420,1070609,1072042,1075458,1076212,1078412,1079801,1081334 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,72
svn commit: r1094602 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Mon Apr 18 14:43:26 2011 New Revision: 1094602 URL: http://svn.apache.org/viewvc?rev=1094602&view=rev Log: Add missing whitespace Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1094602&r1=1094601&r2=1094602&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Mon Apr 18 14:43:26 2011 @@ -651,21 +651,21 @@ (int)Tomcat will cache SocketProcessor objects to reduce garbage collection. The integer value specifies how many objects to keep in the cache at most. The default is 500. Other values are --1 for unlimited cache and 0for no cache. +-1 for unlimited cache and 0 for no cache. (int)Tomcat will cache KeyAttachment objects to reduce garbage collection. The integer value specifies how many objects to keep in the cache at most. The default is 500. Other values are --1 for unlimited cache and 0for no cache. +-1 for unlimited cache and 0 for no cache. (int)Tomcat will cache PollerEvent objects to reduce garbage collection. The integer value specifies how many objects to keep in the cache at most. The default is 500. Other values are --1 for unlimited cache and 0for no cache. +-1 for unlimited cache and 0 for no cache. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: processorCache for APR connector is unlimited
On 08/04/2011 09:58, Tim Whittington wrote: > The Http11Protocol and Http11NioProtocol connectors set processorCache > to 200 by default, which matches the docs ([2]). > The Http11AprProtocol sets it to -1 (unlimited) - is this > intentional/desired or accidental? > > This appears to have been introduced in [1] during some refactoring by Mladen. processorCache was -1 for HTTP APR prior to this. Digging through svn shows that it has always had an unlimited cache. AJP (both BIO and APR) uses an unlimited cache (although the docs say 200). With the polling nature of APR and NIO and also with async connections it is certainly possible that more processors will be required than threads. More so with NIO that doesn't simulate blocking while the request line is read. However, that doesn't necessarily mean that there will be more than 200 idle processors. 200 seems like a reasonable default at the moment. Since the documentation everywhere says the default is 200, I will make that change shortly along with a better description of what an appropriate setting is. Mark > [1] http://svn.apache.org/viewvc?view=revision&revision=991359 > [2] http://tomcat.apache.org/tomcat-7.0-doc/config/http.html > > cheers > tim > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1094621 - in /tomcat/trunk: java/org/apache/coyote/ java/org/apache/coyote/http11/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Mon Apr 18 15:38:07 2011
New Revision: 1094621
URL: http://svn.apache.org/viewvc?rev=1094621&view=rev
Log:
Align connector implementations with documented default for processorCache
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java?rev=1094621&r1=1094620&r2=1094621&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocolHandler.java Mon Apr 18
15:38:07 2011
@@ -98,11 +98,12 @@ public abstract class AbstractProtocolHa
/**
* The maximum number of idle processors that will be retained in the cache
- * and re-used with a subsequent request. The default is -1, unlimited,
- * although in that case there will never be more Processor objects than
- * there are threads in the associated thread pool.
+ * and re-used with a subsequent request. The default is 200. A value of -1
+ * means unlimited. In the unlimited case, the theoretical maximum number
of
+ * cached Processor objects is {@link #getMaxConnections()} although it
will
+ * usually be closer to {@link #getMaxThreads()}.
*/
-protected int processorCache = -1;
+protected int processorCache = 200;
public int getProcessorCache() { return this.processorCache; }
public void setProcessorCache(int processorCache) {
this.processorCache = processorCache;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1094621&r1=1094620&r2=1094621&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Apr
18 15:38:07 2011
@@ -76,7 +76,6 @@ public class Http11AprProtocol extends A
setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
-setProcessorCache(-1);
}
private final Http11ConnectionHandler cHandler;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1094621&r1=1094620&r2=1094621&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Apr
18 15:38:07 2011
@@ -74,7 +74,6 @@ public class Http11NioProtocol extends A
setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
-setProcessorCache(200);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1094621&r1=1094620&r2=1094621&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Mon Apr 18
15:38:07 2011
@@ -74,7 +74,6 @@ public class Http11Protocol extends Abst
setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
-setProcessorCache(200);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1094621&r1=1094620&r2=1094621&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Apr 18 15:38:07 2011
@@ -92,6 +92,13 @@
if it is configured for SSL and an invalid value is provided for
SSLProtocol. (markt)
+
+Align all the connector implementations with the documented default
+setting for processorCache of 200. This changes the default
svn commit: r1094650 - in /tomcat/trunk/java/org/apache/catalina/users: AbstractGroup.java AbstractRole.java AbstractUser.java MemoryUser.java MemoryUserDatabase.java MemoryUserDatabaseFactory.java
Author: markt
Date: Mon Apr 18 16:59:26 2011
New Revision: 1094650
URL: http://svn.apache.org/viewvc?rev=1094650&view=rev
Log:
Add missing @Override
Modified:
tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java
tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java
tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java?rev=1094650&r1=1094649&r2=1094650&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java Mon Apr 18
16:59:26 2011
@@ -59,6 +59,7 @@ public abstract class AbstractGroup impl
/**
* Return the description of this group.
*/
+@Override
public String getDescription() {
return (this.description);
@@ -71,6 +72,7 @@ public abstract class AbstractGroup impl
*
* @param description The new description
*/
+@Override
public void setDescription(String description) {
this.description = description;
@@ -82,6 +84,7 @@ public abstract class AbstractGroup impl
* Return the group name of this group, which must be unique
* within the scope of a {@link UserDatabase}.
*/
+@Override
public String getGroupname() {
return (this.groupname);
@@ -95,6 +98,7 @@ public abstract class AbstractGroup impl
*
* @param groupname The new group name
*/
+@Override
public void setGroupname(String groupname) {
this.groupname = groupname;
@@ -105,12 +109,14 @@ public abstract class AbstractGroup impl
/**
* Return the set of {@link Role}s assigned specifically to this group.
*/
+@Override
public abstract Iterator getRoles();
/**
* Return the {@link UserDatabase} within which this Group is defined.
*/
+@Override
public abstract UserDatabase getUserDatabase();
@@ -118,6 +124,7 @@ public abstract class AbstractGroup impl
* Return an Iterator over the set of {@link org.apache.catalina.User}s
that
* are members of this group.
*/
+@Override
public abstract Iterator getUsers();
@@ -129,6 +136,7 @@ public abstract class AbstractGroup impl
*
* @param role The new role
*/
+@Override
public abstract void addRole(Role role);
@@ -137,6 +145,7 @@ public abstract class AbstractGroup impl
*
* @param role The role to check
*/
+@Override
public abstract boolean isInRole(Role role);
@@ -145,12 +154,14 @@ public abstract class AbstractGroup impl
*
* @param role The old role
*/
+@Override
public abstract void removeRole(Role role);
/**
* Remove all {@link Role}s from those assigned to this group.
*/
+@Override
public abstract void removeRoles();
@@ -160,6 +171,7 @@ public abstract class AbstractGroup impl
/**
* Make the principal name the same as the group name.
*/
+@Override
public String getName() {
return (getGroupname());
Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java?rev=1094650&r1=1094649&r2=1094650&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java Mon Apr 18
16:59:26 2011
@@ -55,6 +55,7 @@ public abstract class AbstractRole imple
/**
* Return the description of this role.
*/
+@Override
public String getDescription() {
return (this.description);
@@ -67,6 +68,7 @@ public abstract class AbstractRole imple
*
* @param description The new description
*/
+@Override
public void setDescription(String description) {
this.description = description;
@@ -78,6 +80,7 @@ public abstract class AbstractRole imple
* Return the role name of this role, which must be unique
* within the scope of a {@link UserDatabase}.
*/
+@Override
public String getRolename() {
return (this.rolename);
@@ -91,6 +94,7 @@ public abstract class AbstractRole imple
*
* @param rolename The new role name
*/
+@Override
public void setRolename(String rolename) {
this.rolename = rolename;
@@ -101,6 +105,7 @@ public abstract class AbstractRole imple
/**
