svn commit: r942683 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/session/StandardManager.java webapps/docs/changelog.xml
Author: kfujino
Date: Mon May 10 08:39:48 2010
New Revision: 942683
URL: http://svn.apache.org/viewvc?rev=942683&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49116
If session is already invalid, expire session to prevent memory leak.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.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=942683&r1=942682&r2=942683&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 10 08:39:48 2010
@@ -215,12 +215,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49116
- If session is already invalid, expire session to prevent memory leak.
- http://svn.apache.org/viewvc?view=revision&revision=933881
- +1: kfujino, markt, kkolinko
- -1:
-
* sessionCounter and expiredSessions declares as long instead of int.
http://svn.apache.org/viewvc?view=revision&revision=934337
+1: kfujino
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java?rev=942683&r1=942682&r2=942683&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
Mon May 10 08:39:48 2010
@@ -395,6 +395,12 @@ public class StandardManager
session.setManager(this);
sessions.put(session.getIdInternal(), session);
session.activate();
+if (!session.isValidInternal()) {
+// If session is already invalid,
+// expire session to prevent memory leak.
+session.setValid(true);
+session.expire();
+}
sessionCounter++;
}
} catch (ClassNotFoundException e) {
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=942683&r1=942682&r2=942683&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 10 08:39:48 2010
@@ -92,6 +92,10 @@
action in the Manager web application. (kkolinko)
+49116: If session is already invalid, expire session to
+prevent memory leak. (kfujino)
+
+
49245: Fix session expiration check in cross-context
requests. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49116] Memory leak by HttpSession.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49116 Keiichi Fujino changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Keiichi Fujino 2010-05-10 04:42:59 EDT --- This fix applied to 6.0, will be in 6.0.27 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r942701 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml
Author: kfujino
Date: Mon May 10 09:58:30 2010
New Revision: 942701
URL: http://svn.apache.org/viewvc?rev=942701&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
Do not send duplicated session.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.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=942701&r1=942700&r2=942701&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 10 09:58:30 2010
@@ -257,12 +257,6 @@ PATCHES PROPOSED TO BACKPORT:
- If you are going to change the default, do it in the code
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
- Do not send duplicated session.
- http://svn.apache.org/viewvc?view=revision&revision=936777
- +1: kfujino, kkolinko, markt
- -1:
-
* Make the principal implement Serializable
http://svn.apache.org/viewvc?view=revision&revision=939491
+1: fhanik, markt, kkolinko
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=942701&r1=942700&r2=942701&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Mon May 10 09:58:30 2010
@@ -1507,10 +1507,9 @@ public class DeltaManager extends Cluste
sendSessions(sender, currentSessions, findSessionTimestamp);
} else {
// send session at blocks
-int len = currentSessions.length < getSendAllSessionsSize() ?
currentSessions.length : getSendAllSessionsSize();
-Session[] sendSessions = new Session[len];
for (int i = 0; i < currentSessions.length; i +=
getSendAllSessionsSize()) {
-len = i + getSendAllSessionsSize() > currentSessions.length ?
currentSessions.length - i : getSendAllSessionsSize();
+int len = i + getSendAllSessionsSize() >
currentSessions.length ? currentSessions.length - i : getSendAllSessionsSize();
+Session[] sendSessions = new Session[len];
System.arraycopy(currentSessions, i, sendSessions, 0, len);
sendSessions(sender, sendSessions,findSessionTimestamp);
if (getSendAllSessionsWaitTime() > 0) {
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=942701&r1=942700&r2=942701&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 10 09:58:30 2010
@@ -146,6 +146,9 @@
49151: Avoid ClassCastException in BackupManager#stop.
(kfujino)
+
+49170: Do not send duplicated session. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r942703 - in /tomcat/tc5.5.x/trunk: ./ container/modules/cluster/src/share/org/apache/catalina/cluster/session/ container/modules/ha/src/share/org/apache/catalina/ha/session/ container/web
Author: kfujino
Date: Mon May 10 10:26:35 2010
New Revision: 942703
URL: http://svn.apache.org/viewvc?rev=942703&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
Do not send duplicated session.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=942703&r1=942702&r2=942703&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon May 10 10:26:35 2010
@@ -116,14 +116,6 @@ PATCHES PROPOSED TO BACKPORT:
http://svn.apache.org/viewvc?view=revision&revision=749019
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49170
- Do not send duplicated session.
- http://svn.apache.org/viewvc?view=revision&revision=936777
- +1: kfujino
- +1: kkolinko, markt: to apply to the both DeltaManager classes in TC 5.5 (in
- o.a.c.ha.session and o.a.c.cluster.session packages)
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49236
Do not use indexing when packing Tomcat JARs.
https://issues.apache.org/bugzilla/attachment.cgi?id=25382
Modified:
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=942703&r1=942702&r2=942703&view=diff
==
---
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Mon May 10 10:26:35 2010
@@ -1741,13 +1741,9 @@ public class DeltaManager extends Manage
sendSessions(sender, currentSessions, findSessionTimestamp);
} else {
// send session at blocks
-int len = currentSessions.length < getSendAllSessionsSize() ?
currentSessions.length
-: getSendAllSessionsSize();
-Session[] sendSessions = new Session[len];
for (int i = 0; i < currentSessions.length; i +=
getSendAllSessionsSize()) {
-len = i + getSendAllSessionsSize() > currentSessions.length ?
currentSessions.length
-- i
-: getSendAllSessionsSize();
+int len = i + getSendAllSessionsSize() >
currentSessions.length ? currentSessions.length - i : getSendAllSessionsSize();
+Session[] sendSessions = new Session[len];
System.arraycopy(currentSessions, i, sendSessions, 0, len);
sendSessions(sender, sendSessions,findSessionTimestamp);
if (getSendAllSessionsWaitTime() > 0) {
Modified:
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java?rev=942703&r1=942702&r2=942703&view=diff
==
---
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/ha/src/share/org/apache/catalina/ha/session/DeltaManager.java
Mon May 10 10:26:35 2010
@@ -1477,10 +1477,9 @@ public class DeltaManager extends Cluste
sendSessions(sender, currentSessions, findSessionTimestamp);
} else {
// send session at blocks
-int len = currentSessions.length < getSendAllSessionsSize() ?
currentSessions.length : getSendAllSessionsSize();
-Session[] sendSessions = new Session[len];
for (int i = 0; i < currentSessions.length; i +=
getSendAllSessionsSize()) {
-len = i + getSendAllSessionsSize() > currentSessions.length ?
currentSessions.length - i : getSendAllSessionsSize();
+int len = i + getSendAllSessionsSize() >
currentSessions.length ? currentSessions.length - i : getSendAllSessionsSize();
+Session[] sendSessions = new Session[len];
System.arraycopy(currentSessions, i, sendSessions, 0, len);
sendSessions(sender, sendSessions,findSessionTimestamp);
if (getSendAllSessionsWaitTime() > 0) {
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc
DO NOT REPLY [Bug 49170] Transmission of duplicated session in DeltaManager#handleGET_ALL_SESSIONS.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49170 --- Comment #2 from Keiichi Fujino 2010-05-10 06:29:36 EDT --- This fix applied to 6.0, will be in 6.0.27 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49170] Transmission of duplicated session in DeltaManager#handleGET_ALL_SESSIONS.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49170 Keiichi Fujino changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Keiichi Fujino 2010-05-10 06:30:06 EDT --- This fix applied to 5.5, will be in 5.5.30 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: r942705 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Mon May 10 10:56:09 2010 New Revision: 942705 URL: http://svn.apache.org/viewvc?rev=942705&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=942705&r1=942704&r2=942705&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon May 10 10:56:09 2010 @@ -272,7 +272,7 @@ PATCHES PROPOSED TO BACKPORT: Do not use indexing when packing Tomcat JARs. In TC6 it affects the DBCP and JDT jars. https://issues.apache.org/bugzilla/attachment.cgi?id=25381 - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * If any error happens in shutdown hook, do not forget to shutdown the @@ -284,10 +284,10 @@ PATCHES PROPOSED TO BACKPORT: will write the first one of them to stderr, thus they will leave us a trace, instead of being lost in a buffer. http://svn.apache.org/viewvc?rev=940064&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * Update to DBCP 1.3 http://people.apache.org/~markt/patches/2010-05-06-dbcp13-tc6.patch - +1: markt, kkolinko + +1: markt, kkolinko, kfujino -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r942706 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kfujino Date: Mon May 10 10:57:03 2010 New Revision: 942706 URL: http://svn.apache.org/viewvc?rev=942706&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=942706&r1=942705&r2=942706&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon May 10 10:57:03 2010 @@ -87,7 +87,7 @@ PATCHES PROPOSED TO BACKPORT: session events http://svn.apache.org/viewvc?rev=928482&view=rev (apply to both cluster implementations) - +1: markt, kkolinko + +1: markt, kkolinko, kfujino -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48840 @@ -119,10 +119,10 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49236 Do not use indexing when packing Tomcat JARs. https://issues.apache.org/bugzilla/attachment.cgi?id=25382 - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * Update to DBCP 1.3 http://people.apache.org/~markt/patches/2010-05-06-dbcp13-tc5.patch - +1: markt, kkolinko + +1: markt, kkolinko, kfujino -1: \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: CSRF prevention filter and Tomcat 5/6
2010/5/7 Mark Thomas : > I'm trying to decide the best way to back-port the configuration of this to > the (Host) Manager app in Tomcat 5 & 6. > > The requirements are: > - not to break anything that currently works > - enable CSRF for the HTML interface > - the same user cannot have access to the HTML and text interfaces for the > filter to be effective. > > I can't see a way to meet all of these. > > The options I am considering are: > A: change the role required to access the text interface to manager-text > - consistent with Tomcat 7 > - will break tools currently using the manager role > > B: comment out the mapping for the test interface > - will break tools currently using the text interface > > C: change the role required to access the HTML interface > - not consistent with Tomcat 7 > - will break user access to the Manager GUI > > D: Don't enable the filter by default but provide instructions on what to do > if you do want to enable it in the docs. Something along the lines of: > - uncomment the Filter and filter mapping > - change the role used for the text and jmx interfaces (to match the new > names in Tomcat 7) > > I am currently leaning towards D along with some changes to the web.xml > files that won't change current behaviour but will make it simpler to add > the CSRF filter. > > Thoughts? > It is possible to combine A+C: E. Use a different name for the new role that allows access to GUI interface only, "manager-gui", as well as new "manager-script", "manager-jmx", "manager-status". We can even rename "manager" -> "manager-gui" in Tomcat 7. The "manager" role is preserved as is, but is documented as "deprecated" and is no longer recommended for use. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r942794 - in /tomcat/trunk/java/org/apache/catalina: Lifecycle.java util/LifecycleBase.java
Author: markt
Date: Mon May 10 15:41:58 2010
New Revision: 942794
URL: http://svn.apache.org/viewvc?rev=942794&view=rev
Log:
Allow the transition from NEW to DESTROYED for objects that are never started.
Modified:
tomcat/trunk/java/org/apache/catalina/Lifecycle.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Lifecycle.java?rev=942794&r1=942793&r2=942794&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java Mon May 10 15:41:58
2010
@@ -31,25 +31,29 @@ package org.apache.catalina;
* |
|
*init() start() |auto auto stop()
|
* NEW ->-- INITIALIZED -->-- STARTING_PREP -->- STARTING -->- STARTED -->---
|
- * | | ^ | |
|
- * | |start() | | |
|
- * | ---> | |
|
- * | | |
|
- * | autoauto | |
|
- * |stop() -<- MUST_STOP -<-- |
|
- * | | |
|
- * | ---<
^
- * | |
|
- * | | auto auto start()
|
- * |STOPPING_PREP -->- STOPPING -->- STOPPED
>--
- * | ^ | | ^
- * | | auto | | |
- * | |stop()MUST_DESTROY--<--- | |
- * | || | |
- * | ||auto | |
- * | |destroy() \|/ destroy() | |
- * | FAILED >-- DESTROYED <- |
+ * ||| ^ | |
|
+ * |||start() | | |
|
+ * ||---> | |
|
+ * || | |
|
+ * |---autoauto | |
|
+ * | | -<- MUST_STOP -<-- |
|
+ * | | | |
|
+ * | | ---<
^
+ * | | |
|
+ * | | | auto auto start()
|
+ * | | STOPPING_PREP -->- STOPPING -->- STOPPED
>--
+ * | | ^ | | ^
+ * | | | auto | | |
+ * | | |stop()MUST_DESTROY--<--- | |
+ * | | || | |
+ * | | ||auto | |
+ * | | |destroy() \|/ destroy() | |
+ * | | FAILED >-- DESTROYED <- |
+ * | | ^ |
+ * | |destroy()| |
+ * | --- |
* | |
+ * |stop() |
* --->-->--
*
* Any state can transition to FAILED.
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=942794&r1=942793&r2=942794&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Mon May 10
15:41:58 2010
@@ -255,7 +255,8 @@ public abstract class LifecycleBase impl
}
if (!state.equals(LifecycleState.STOPPED) &&
-!state.equals(LifecycleState.FAILED)) {
+
svn commit: r942797 - /tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Author: markt
Date: Mon May 10 15:44:52 2010
New Revision: 942797
URL: http://svn.apache.org/viewvc?rev=942797&view=rev
Log:
Make sure Tomcat instance is closed down correctly (prevents warnings in the
logs).
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=942797&r1=942796&r2=942797&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Mon May
10 15:44:52 2010
@@ -104,11 +104,15 @@ public abstract class TomcatBaseTest ext
@Override
public void tearDown() throws Exception {
-// Some tests may call tomcat.destroy(). In which case, don't
-// call stop()
+// Some tests may call tomcat.destroy(), some tests may just call
+// tomcat.stop(), smoe not call either method. Make sure that stop() &
+// destroy() are called as necessary.
if (tomcat.server != null &&
tomcat.server.getState() != LifecycleState.DESTROYED) {
-tomcat.stop();
+if (tomcat.server.getState() != LifecycleState.STOPPED) {
+tomcat.stop();
+}
+tomcat.destroy();
}
ExpandWar.delete(tempDir);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: CSRF prevention filter and Tomcat 5/6
On 10/05/2010 13:25, Konstantin Kolinko wrote: Thoughts? It is possible to combine A+C: E. Use a different name for the new role that allows access to GUI interface only, "manager-gui", as well as new "manager-script", "manager-jmx", "manager-status". We can even rename "manager" -> "manager-gui" in Tomcat 7. The "manager" role is preserved as is, but is documented as "deprecated" and is no longer recommended for use. I like it. Neat solution. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49268] New: Use checkstyle to enforce common code style
https://issues.apache.org/bugzilla/show_bug.cgi?id=49268 Summary: Use checkstyle to enforce common code style Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Linux Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: mguille...@yahoo.fr Created an attachment (id=25423) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25423) Patch adding target checkstyle to main build.xml with a extrem minimal number of checks Tomcat code style is not consistent but it should be (it would give more time to discuss about unit tests rather than about code style). Rather than to propose a huge patch in one time, I propose a simple one that: - adds a checkstyle target to the build.xml - adds a chestyle.xml configuration file (the "sun coding conventions") with nearly everything deactivated (otherwise it gives over 8 style errors) - activates only check for tabs With this check the checkstyle target fails as a lot of files still contain a tab character. A find / replace by a committer makes far more sense than providing it in the patch as it would be more difficult to review. Of course it would make sense to add this target to the default build. Once this patch has been applied, work can start on other checkers, like the one verifying the presence of Version Javdoc tag in the right format. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49269] New: Shouldn't see maxIdle > maxActive message with default props
https://issues.apache.org/bugzilla/show_bug.cgi?id=49269 Summary: Shouldn't see maxIdle > maxActive message with default props Product: Tomcat 7 Version: trunk Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Modules: jdbc-pool AssignedTo: dev@tomcat.apache.org ReportedBy: mpass...@grovehillsoftware.com In PoolProperties, the default value for maxIdle is Integer.MAX_VALUE and the default for maxActive is 100. This results in a warning message being logged and the value for maxIdle set to match maxActive on lines 393/394 of ConnectionPool. The default for maxIdle should match that of maxActive. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49269] Shouldn't see maxIdle > maxActive message with default props
https://issues.apache.org/bugzilla/show_bug.cgi?id=49269 --- Comment #1 from Matt Passell 2010-05-10 15:05:13 EDT --- Created an attachment (id=25424) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25424) default value for maxIdle matches maxActive Here's a patch. If there are any problems applying it, it just involves changing line 50 of PoolProperties.java to: protected int maxIdle = maxActive; -- 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: r943018 - /tomcat/taglibs/site/src/site/xdoc/index.xml
Author: bayard Date: Tue May 11 06:41:29 2010 New Revision: 943018 URL: http://svn.apache.org/viewvc?rev=943018&view=rev Log: Updating retired taglibs link to point to the new location for the page (attic) Modified: tomcat/taglibs/site/src/site/xdoc/index.xml Modified: tomcat/taglibs/site/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/src/site/xdoc/index.xml?rev=943018&r1=943017&r2=943018&view=diff == --- tomcat/taglibs/site/src/site/xdoc/index.xml (original) +++ tomcat/taglibs/site/src/site/xdoc/index.xml Tue May 11 06:41:29 2010 @@ -37,7 +37,7 @@ Apache Taglibs was originally called Jakarta Taglibs. When the project changed name, and moved over to coexist with the Tomcat project, many of the original taglibs were retired. See the - http://jakarta.apache.org/site/retired-taglibs.html";>Jakarta Taglibs retirement page for + http://attic.apache.org/projects/jakarta-taglibs.html";>Jakarta Taglibs retirement page for more on these taglibs. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
