svn commit: r892719 - in /tomcat/jk/trunk: native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml
Author: mturk
Date: Mon Dec 21 08:03:15 2009
New Revision: 892719
URL: http://svn.apache.org/viewvc?rev=892719&view=rev
Log:
Fix #46893 by monitoring if the JkShmSize was used
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=892719&r1=892718&r2=892719&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Dec 21 08:03:15 2009
@@ -253,6 +253,7 @@
static apr_global_mutex_t *jk_log_lock = NULL;
static char *jk_shm_file = NULL;
static size_t jk_shm_size = 0;
+static int jk_shm_size_set = 0;
static volatile int jk_watchdog_interval = 0;
static volatile int jk_watchdog_running = 0;
@@ -1315,6 +1316,8 @@
else
sz = JK_SHM_ALIGN(sz);
jk_shm_size = (size_t)sz;
+if (jk_shm_size)
+jk_shm_size_set = 1;
return NULL;
}
@@ -3152,7 +3155,7 @@
#endif
if (jk_shm_size == 0)
jk_shm_size = jk_shm_calculate_size(jk_worker_properties, conf->log);
-else {
+else if (jk_shm_size_set) {
jk_log(conf->log, JK_LOG_WARNING,
"The optimal shared memory size can now be determined
automatically.");
jk_log(conf->log, JK_LOG_WARNING,
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892719&r1=892718&r2=892719&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 08:03:15 2009
@@ -44,6 +44,10 @@
+46893: Httpd: Log warning only if JkShmSize was actually
+set in the configuration. (mturk)
+
+
48410: Use poll instead select so we can work with more.
then 1024 sockets. (mturk)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46893] mod_jk statically compiled always outputs warning regarding shm size specification
https://issues.apache.org/bugzilla/show_bug.cgi?id=46893 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mladen Turk 2009-12-21 00:03:48 UTC --- Fixed in the SVN. -- 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 41430] JkOptions +ForwardDirectories with Apache's DirectoryIndex
https://issues.apache.org/bugzilla/show_bug.cgi?id=41430 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #17 from Mladen Turk 2009-12-21 00:07:48 UTC --- mod_jk doesn't support DirectoryIndex any more. Make sure the welcome-file list inside Tomcat is setup correctly. -- 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: r892725 - in /tomcat/jk/trunk/native: common/jk_connect.c configure.in
Author: mturk
Date: Mon Dec 21 08:31:40 2009
New Revision: 892725
URL: http://svn.apache.org/viewvc?rev=892725&view=rev
Log:
Add SOCK_CLOEXEC|FD_CLOEXEC when creting sockets. This should fix the #48169
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
tomcat/jk/trunk/native/configure.in
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=892725&r1=892724&r2=892725&view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Mon Dec 21 08:31:40 2009
@@ -427,6 +427,7 @@
jk_sock_t sd;
int set = 1;
int ret = 0;
+int flags = 0;
#ifdef SO_LINGER
struct linger li;
#endif
@@ -434,7 +435,10 @@
JK_TRACE_ENTER(l);
errno = 0;
-sd = socket(AF_INET, SOCK_STREAM, 0);
+#if defined(SOCK_CLOEXEC) && defined(USE_SOCK_CLOEXEC)
+flags |= SOCK_CLOEXEC;
+#endif
+sd = socket(AF_INET, SOCK_STREAM | flags, 0);
if (!IS_VALID_SOCKET(sd)) {
JK_GET_SOCKET_ERRNO();
jk_log(l, JK_LOG_ERROR,
@@ -442,6 +446,26 @@
JK_TRACE_EXIT(l);
return JK_INVALID_SOCKET;
}
+#if defined(FD_CLOEXEC) && !defined(USE_SOCK_CLOEXEC)
+if ((flags = fcntl(sd, F_GETFD)) == -1) {
+JK_GET_SOCKET_ERRNO();
+jk_log(l, JK_LOG_ERROR,
+ "fcntl() failed (errno=%d)", errno);
+jk_close_socket(sd, l);
+JK_TRACE_EXIT(l);
+return JK_INVALID_SOCKET;
+}
+flags |= FD_CLOEXEC;
+if (fcntl(sd, F_SETFD, flags) == -1) {
+JK_GET_SOCKET_ERRNO();
+jk_log(l, JK_LOG_ERROR,
+ "fcntl() failed (errno=%d)", errno);
+jk_close_socket(sd, l);
+JK_TRACE_EXIT(l);
+return JK_INVALID_SOCKET;
+}
+#endif
+
/* Disable Nagle algorithm */
if (setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, (SET_TYPE)&set,
sizeof(set))) {
Modified: tomcat/jk/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.in?rev=892725&r1=892724&r2=892725&view=diff
==
--- tomcat/jk/trunk/native/configure.in (original)
+++ tomcat/jk/trunk/native/configure.in Mon Dec 21 08:31:40 2009
@@ -319,6 +319,35 @@
JK_CHECK_SETSOCKOPT(SO_RCVTIMEO)
JK_CHECK_SETSOCKOPT(SO_SNDTIMEO)
+AC_DEFUN([JK_CHECK_SOCKOPT], [
+AC_MSG_CHECKING(whether to use $1 with socket())
+AC_TRY_RUN([
+#include
+#include
+#include
+
+int main(void)
+{
+int s;
+
+#ifndef $1
+exit(3);
+#else
+if ((s = socket(AF_INET, SOCK_STREAM | $1, 0)) == -1)
+exit(2);
+
+exit(0);
+#endif
+}
+]
+, [ AC_MSG_RESULT([yes]) AC_DEFINE(USE_$1, 1, [Define to use $1 with
socket()]) ]
+, [ AC_MSG_RESULT([no]) ]
+)
+])dnl
+
+dnl check for SOCK_CLOEXEC
+JK_CHECK_SOCKOPT(SOCK_CLOEXEC)
+
dnl check for poll.h header
AC_CHECK_HEADERS(poll.h)
dnl check for poll function
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48169] two second delay for cgi scripts mixed with mod_jk
https://issues.apache.org/bugzilla/show_bug.cgi?id=48169 --- Comment #3 from Mladen Turk 2009-12-21 00:34:01 UTC --- Can you check if the http://svn.apache.org/viewvc?rev=892725&view=rev fixes the issue? It uses SOCK_CLOEXEC|FD_CLOEXEC so it should close all sockets on fork() -- 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
release 6.0.21
Hi, Later today I will tag and go for the release, make sure all the patches you want to see in are committed :-) It will also add binaries for tc-native Comments? Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892341 - /tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
2009/12/18 sebb :
> On 18/12/2009, ma...@apache.org wrote:
>> Author: markt
>> Date: Fri Dec 18 18:42:09 2009
>> New Revision: 892341
>>
>> URL: http://svn.apache.org/viewvc?rev=892341&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47930
>> Make swapIn thread safe so parallel requests for the same session don't
>> result in multiple session objects for one sesison.
>>
>> + /**
>> + * Sessions currently being swapped in and the associated locks
>> + */
>> + private Map sessionSwapInLocks =
>> + new HashMap();
>
> Could/should be final ...
>
1)
* quickly find that the session is already in sessions, use it and
* carry on.
This is only true if loading succeeds.
If loading fails, nothing will be found in sessions, and loading will
be retried. Not good. (Not fatal, but waste of time).
I think that we can differentiate the thread that created the lock
from the next ones, that obtained it from the map, and allow only the
first one to perform loading.
A CountDownLatch can be useful here.
2)
if (sessionSwapInLocks.containsKey(id)) {
swapInLock = sessionSwapInLocks.get(id);
can be replaced with
swapInLock = sessionSwapInLocks.get(id);
if (swapInLock == null) { ...
3) I agree with sebb's proposal to make the field final.
3) Modified lines were indented with tabs, instead of spaces.
Misprints:
s/trues/tries/
s/will re-creates/will re-create/
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: r892746 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Dec 21 10:36:24 2009 New Revision: 892746 URL: http://svn.apache.org/viewvc?rev=892746&view=rev Log: Simplify patch proposal My patch is exactly the same as Konstantin's less r834047 which has already been applied to 6.0.x and adds r881765 that fixes a trivial typo Given the similarity of the patches, I am leaving Konstatin's vote in place 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=892746&r1=892745&r2=892746&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 10:36:24 2009 @@ -262,15 +262,9 @@ -1: * Further improvements to Windows installer password handling -http://svn.apache.org/viewvc?rev=836036&view=rev -http://svn.apache.org/viewvc?rev=836045&view=rev -http://svn.apache.org/viewvc?rev=836209&view=rev - The following patch file is a combination of rev. 834047, 836036, 836045, - 836209: - http://people.apache.org/~kkolinko/patches/2009-11-14_Installer_password_tc6.patch - +1: kkolinko - -1: - +0: markt Combined patch needs to have 834047 removed and 881765 added + http://people.apache.org/~markt/patches/2009-12-21-windows-installer.patch + +1: kkolinko, markt + -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 Implement fail-safe EOL conversion for source distributions - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892747 - /tomcat/trunk/webapps/docs/config/systemprops.xml
Author: markt Date: Mon Dec 21 10:38:16 2009 New Revision: 892747 URL: http://svn.apache.org/viewvc?rev=892747&view=rev Log: Review comments and minor typos Modified: tomcat/trunk/webapps/docs/config/systemprops.xml Modified: tomcat/trunk/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=892747&r1=892746&r2=892747&view=diff == --- tomcat/trunk/webapps/docs/config/systemprops.xml (original) +++ tomcat/trunk/webapps/docs/config/systemprops.xml Mon Dec 21 10:38:16 2009 @@ -202,13 +202,11 @@ If this is - true custom HTTP status messages will be used within HTTP + true, custom HTTP status messages will be used within HTTP headers. If a custom message is specified that is not valid for use in an HTTP header (as defined by RFC2616) then the custom message will be - ignored and the default message used. Note that there is some overhead - associated with the additional checking that is performed when custom - messages are used. If not specified the default value of - false will be used. + ignored and the default message used. If not specified, the default value + of false will be used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48410] mod_jk + 1100 virtual hosts + mod_rewrite with enabled log == segmentation fault
https://issues.apache.org/bugzilla/show_bug.cgi?id=48410 --- Comment #3 from Dmitry Goncharov 2009-12-21 02:40:59 UTC --- Thank you! -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892746 - /tomcat/tc6.0.x/trunk/STATUS.txt
2009/12/21 : > Author: markt > Date: Mon Dec 21 10:36:24 2009 > New Revision: 892746 > > URL: http://svn.apache.org/viewvc?rev=892746&view=rev > Log: > Simplify patch proposal > My patch is exactly the same as Konstantin's less r834047 which has already > been applied to 6.0.x and adds r881765 that fixes a trivial typo > Given the similarity of the patches, I am leaving Konstatin's vote in place Good. Thank you! 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: r892751 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Mon Dec 21 10:46:05 2009 New Revision: 892751 URL: http://svn.apache.org/viewvc?rev=892751&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=892751&r1=892750&r2=892751&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 10:46:05 2009 @@ -263,7 +263,7 @@ * Further improvements to Windows installer password handling http://people.apache.org/~markt/patches/2009-12-21-windows-installer.patch - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 @@ -345,14 +345,14 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48413 Correct French translations http://svn.apache.org/viewvc?rev=892555&view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47976 Align usage message and javadoc with implementation http://svn.apache.org/viewvc?view=revision&revision=832214 http://svn.apache.org/viewvc?view=revision&revision=892464 - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47963 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892755 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Dec 21 10:48:58 2009 New Revision: 892755 URL: http://svn.apache.org/viewvc?rev=892755&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=892755&r1=892754&r2=892755&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 10:48:58 2009 @@ -314,7 +314,7 @@ Prevent medium term memory leak if using SSL under a security manager Based on a patch by Greg Vanore http://svn.apache.org/viewvc?rev=890350&view=rev - +1: markt, rjung + +1: markt, rjung, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: release 6.0.21
On Monday 21 December 2009 11:12:12 jean-frederic clere wrote: > Hi, > > Later today I will tag and go for the release, make sure all the patches > you want to see in are committed :-) Well, I'm no committer and I don't understand the relevant code well enough to possibly create a patch, but I hoped that someone would take a look at issue https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 before a release is made (This issue was introduced by changes after 6.0.20, and Mark Thomas told me on the users list to create a bugzilla entry for that). Regards Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892760 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Mon Dec 21 10:54:14 2009
New Revision: 892760
URL: http://svn.apache.org/viewvc?rev=892760&view=rev
Log:
Simplify proposal. No actual changes, just putting everything in a single file
so leaving Konstantin's vote in place.
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=892760&r1=892759&r2=892760&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 10:54:14 2009
@@ -357,31 +357,6 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47963
Prevent use of non-RFC2616 compliant custom status messages
- http://svn.apache.org/viewvc?rev=892612&view=rev
- http://svn.apache.org/viewvc?rev=892707&view=rev
- +1: markt
- +1: kkolinko: (
- 1. only together with rev.892707
- 2. this change, provided by rev.892612,
-
--if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
-+if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER &&
-+HttpMessages.isSafeInHttpHeader(response.getMessage())) {
- message = response.getMessage();
- }
- if (message == null){
- message = HttpMessages.getMessage(response.getStatus());
--} else {
--message = message.replace('\n', ' ').replace('\r', ' ');
- }
-
-has to be applied to the following 6 classes in TC 6:
- in o.a.coyote.ajp: AjpAprProcessor and AjpProcessor,
- in o.a.coyote.http11: InternalAprOutputBuffer,
InternalNioOutputBuffer, InternalOutputBuffer
- in o.a.jk.common: JkInputStream
-(3 of them do not exist in TC 7).
-
- 3. I think that mention of extra overhead in systemprops.xml is not
- necessary.
- )
+ http://people.apache.org/~markt/patches/2009-12-21-bug47963.patch
+ +1: markt, kkolinko
-1:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892341 - /tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
On 21/12/2009 10:32, Konstantin Kolinko wrote:
> 1)
> * quickly find that the session is already in sessions, use it and
> * carry on.
>
> This is only true if loading succeeds.
> If loading fails, nothing will be found in sessions, and loading will
> be retried. Not good. (Not fatal, but waste of time).
I'm not to concerned about this edge case since if the threads are far
enough apart the code will attempt multiple loads anyway. If we were
going to address this (and I'm not convinced we should) a cache of the
last 1000 sessions requested but not found would probably be a better
way to go.
> 2)
> if (sessionSwapInLocks.containsKey(id)) {
> swapInLock = sessionSwapInLocks.get(id);
> can be replaced with
>swapInLock = sessionSwapInLocks.get(id);
>if (swapInLock == null) { ...
Happy to change that.
> 3) I agree with sebb's proposal to make the field final.
And that.
>
> 3) Modified lines were indented with tabs, instead of spaces.
Sorry about that. I rebuilt my laptop and forgot to configure Eclipse to
use spaces. I'll fix that.
> Misprints:
> s/trues/tries/
> s/will re-creates/will re-create/
And those.
I'll make those changes and update the proposal.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: release 6.0.21
On 21/12/2009 10:53, Rainer Frey wrote: > On Monday 21 December 2009 11:12:12 jean-frederic clere wrote: >> Hi, >> >> Later today I will tag and go for the release, make sure all the patches >> you want to see in are committed :-) > > Well, I'm no committer and I don't understand the relevant code well enough > to possibly create a patch, but I hoped that someone would take a look at > issue https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 before a > release is made (This issue was introduced by changes after 6.0.20, and Mark > Thomas told me on the users list to create a bugzilla entry for that). I hadn't forgotten that one - I just hadn't got around to looking at it. I have a few ideas about what might be going on. My guess is that you are relying on the auto-driver registration process. It is this process that triggers the memory leak so Tomcat now forcibly de-registers any drivers the JVM auto-registers. If you get a chance before I get to it later today, try using a context listener to register and de-register the driver when your app starts and stops and let us know how you get on. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 41695] mod_jk with httpd 2.0.58 on Solaris-10 11/06 dumping core
https://issues.apache.org/bugzilla/show_bug.cgi?id=41695 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #11 from Mladen Turk 2009-12-21 03:08:13 UTC --- Fixable by using the same compiler for both mod_jk and httpd. -- 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: r892762 - in /tomcat/tc6.0.x/trunk: STATUS.txt res/config.ini res/tomcat.nsi webapps/docs/changelog.xml
Author: markt
Date: Mon Dec 21 11:09:31 2009
New Revision: 892762
URL: http://svn.apache.org/viewvc?rev=892762&view=rev
Log: (empty)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/res/config.ini
tomcat/tc6.0.x/trunk/res/tomcat.nsi
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=892762&r1=892761&r2=892762&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 11:09:31 2009
@@ -261,11 +261,6 @@
+1: kkolinko
-1:
-* Further improvements to Windows installer password handling
- http://people.apache.org/~markt/patches/2009-12-21-windows-installer.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
Implement fail-safe EOL conversion for source distributions
Based on a patch provided by sebb
Modified: tomcat/tc6.0.x/trunk/res/config.ini
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/config.ini?rev=892762&r1=892761&r2=892762&view=diff
==
--- tomcat/tc6.0.x/trunk/res/config.ini (original)
+++ tomcat/tc6.0.x/trunk/res/config.ini Mon Dec 21 11:09:31 2009
@@ -20,7 +20,7 @@
[Field 3]
Type=Label
-text=Administrator Login
+text=Tomcat Administrator Login (optional)
left=0
right=300
top=30
@@ -29,14 +29,13 @@
[Field 4]
Type=Label
Text=User Name
-left=0
+left=10
right=150
top=50
bottom=65
[Field 5]
Type=Text
-State=admin
left=150
right=250
top=50
@@ -45,7 +44,7 @@
[Field 6]
Type=Label
Text=Password
-left=0
+left=10
right=150
top=70
bottom=85
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=892762&r1=892761&r2=892762&view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Mon Dec 21 11:09:31 2009
@@ -94,14 +94,14 @@
;Descriptions
LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet
container."
LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet
container core."
-LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start
Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000
or Windows XP."
+LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start
Tomcat when the computer is started."
LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat
native .dll for better performance and scalability in production environments."
;LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat
source code."
LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group
for Tomcat."
-LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation
bundle. This include documentation on the servlet container and its
configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
+LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation
bundle. This includes documentation on the servlet container and its
configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
LangString DESC_SecManager ${LANG_ENGLISH} "Install the Tomcat Manager
administrative web application."
LangString DESC_SecHostManager ${LANG_ENGLISH} "Install the Tomcat Host
Manager administrative web application."
-LangString DESC_SecExamples ${LANG_ENGLISH} "Install the Servlet and JSP
example web applications."
+LangString DESC_SecExamples ${LANG_ENGLISH} "Install the Servlet and JSP
examples web application."
LangString DESC_SecAdmin ${LANG_ENGLISH} "Installs the administration web
application.";
;LangString DESC_SecWebapps ${LANG_ENGLISH} "Installs other utility web
applications (WebDAV, balancer, etc)."
@@ -187,7 +187,7 @@
Pop $0
StrCmp $0 "0" InstallOk
MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
- "Failed to install Tomcat6 service.$\r$\nCheck your settings and
permissions$\r$\nIgnore and continue anyway (not recommended)?" \
+ "Failed to install tom...@version_major@ service.$\r$\nCheck your
settings and permissions.$\r$\nIgnore and continue anyway (not recommended)?" \
/SD IDIGNORE IDIGNORE InstallOk IDRETRY InstallRetry
Quit
InstallOk:
@@ -432,6 +432,9 @@
!insertmacro MUI_INSTALLOPTIONS_READ $0 "config.ini" "Field 7" "HWND"
!insertmacro MUI_INSTALLOPTIONS_WRITE "config.ini" "Field 7" "Flags"
"DISABLED"
EnableWindow $0 0
+ ; Clear the values
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "config.ini" "Field 5" "State" ""
+ !insertmacro MUI_INSTALLOPTIONS_WRI
svn commit: r892763 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Mon Dec 21 11:12:05 2009 New Revision: 892763 URL: http://svn.apache.org/viewvc?rev=892763&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=892763&r1=892762&r2=892763&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 11:12:05 2009 @@ -353,5 +353,5 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47963 Prevent use of non-RFC2616 compliant custom status messages http://people.apache.org/~markt/patches/2009-12-21-bug47963.patch - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892764 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/net/jsse/JSSESupport.java webapps/docs/changelog.xml
Author: markt Date: Mon Dec 21 11:13:38 2009 New Revision: 892764 URL: http://svn.apache.org/viewvc?rev=892764&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47744 Prevent medium term memory leak if using SSL under a security manager Based on a patch by Greg Vanore Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 21 11:13:38 2009 @@ -1,2 +1,2 @@ /tomcat:883362 -/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,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,770809,77 0876,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,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889716,890139,890265,890349,890417,891185-891187,891583,892198,892415 +/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,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,770809,77 0876,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,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,8924 15 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892764&r1=892763&r2=892764&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STA
DO NOT REPLY [Bug 47744] Memory leak when using SSL + Java security manager
https://issues.apache.org/bugzilla/show_bug.cgi?id=47744 Mark Thomas changed: What|Removed |Added Component|Catalina|Connector:Coyote Version|6.0.20 |5.5.28 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #6 from Mark Thomas 2009-12-21 03:13:54 GMT --- Patch has been applied to trunk and will be included in 6.0.21 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 propchange: r892762 - svn:log
Author: markt Revision: 892762 Modified property: svn:log Modified: svn:log at Mon Dec 21 11:15:23 2009 -- --- svn:log (original) +++ svn:log Mon Dec 21 11:15:23 2009 @@ -0,0 +1,2 @@ +Improvements to user name and password handling for admin user +Patch by kkolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892769 - in /tomcat/jk/trunk: native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml
Author: mturk
Date: Mon Dec 21 11:24:21 2009
New Revision: 892769
URL: http://svn.apache.org/viewvc?rev=892769&view=rev
Log:
Fix #46632. None of our pools require special handling when httpd is about to
exec a child (eg. CGI). No need to register the pool child cleanup. Still needs
an review
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=892769&r1=892768&r2=892769&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Mon Dec 21 11:24:21 2009
@@ -2732,7 +2732,7 @@
c->envvars_has_own = JK_FALSE;
c->s = s;
-apr_pool_cleanup_register(p, s, jk_apr_pool_cleanup, jk_apr_pool_cleanup);
+apr_pool_cleanup_register(p, s, jk_apr_pool_cleanup,
apr_pool_cleanup_null);
return c;
}
@@ -2985,7 +2985,9 @@
/* hgo...@20070425 */
/* Shouldn't we clean both conf->log and main_log ?
*/
/* Also should we pass pointer (ie: main_log) or handle
(*main_log) ? */
-apr_pool_cleanup_register(p, &main_log, jklog_cleanup,
jklog_cleanup);
+apr_pool_cleanup_register(p, &main_log,
+ jklog_cleanup,
+ apr_pool_cleanup_null);
}
return 0;
@@ -3061,7 +3063,7 @@
if ((rc = jk_shm_attach(jk_shm_file, jk_shm_size, conf->log)) == 0) {
apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
- jk_cleanup_shmem);
+ apr_pool_cleanup_null);
}
else
jk_log(conf->log, JK_LOG_ERROR, "Attaching shm:%s errno=%d",
@@ -3162,8 +3164,9 @@
"You can remove the JkShmSize directive if you want to use the
optimal size.");
}
if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) == 0) {
-apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
- jk_cleanup_shmem);
+apr_pool_cleanup_register(pconf, conf->log,
+ jk_cleanup_shmem,
+ apr_pool_cleanup_null);
}
else
jk_log(conf->log, JK_LOG_ERROR,
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892769&r1=892768&r2=892769&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 11:24:21 2009
@@ -44,6 +44,10 @@
+46632: Httpd: Do not register child cleanup with
+none of our pools. (mturk)
+
+
46893: Httpd: Log warning only if JkShmSize was actually
set in the configuration. (mturk)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46632] mod_jk's sockets close prematurely when the server forks a child
https://issues.apache.org/bugzilla/show_bug.cgi?id=46632 --- Comment #1 from Mladen Turk 2009-12-21 03:26:27 UTC --- Fixed in the SVN. If needed the child cleanup certainly cannot be the same as standard pool cleanup we are using currently. -- 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 46862] Status worker Properties output format (worker.wlb.balance_workers member)
https://issues.apache.org/bugzilla/show_bug.cgi?id=46862 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mladen Turk 2009-12-21 03:29:02 UTC --- mod_jk properties are not java properties neither they pretend to be. -- 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: r892771 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/valves/LocalStrings_fr.properties webapps/docs/changelog.xml
Author: markt Date: Mon Dec 21 11:31:23 2009 New Revision: 892771 URL: http://svn.apache.org/viewvc?rev=892771&view=rev Log: (empty) 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/LocalStrings_fr.properties tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 21 11:31:23 2009 @@ -1,2 +1,2 @@ /tomcat:883362 -/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,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,770809,77 0876,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,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,8924 15 +/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,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,770809,77 0876,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,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,8924 15,892555 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892771&r1=892770&r2=892771&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 11:31:23 2009 @@ -330,12 +330,6 @@ +1: markt, rjung -1: -* Fix https://issues.apache.org/bugzilla/show_bu
DO NOT REPLY [Bug 48413] correction of typos in valves/LocalStrings_fr.properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=48413 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2009-12-21 03:32:05 GMT --- Your patch has been applied to 6.0.x and will be included in 6.0.21 onwards. Again, many thanks. -- 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 propchange: r892771 - svn:log
Author: markt Revision: 892771 Modified property: svn:log Modified: svn:log at Mon Dec 21 11:33:27 2009 -- --- svn:log (original) +++ svn:log Mon Dec 21 11:33:27 2009 @@ -0,0 +1,3 @@ +https://issues.apache.org/bugzilla/show_bug.cgi?id=48413 +Correct some French translations. +Patch provided by André Warnier. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892773 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/startup/Catalina.java webapps/docs/changelog.xml
Author: markt Date: Mon Dec 21 11:38:21 2009 New Revision: 892773 URL: http://svn.apache.org/viewvc?rev=892773&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47976 Align usage message and javadoc with implementation Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 21 11:38:21 2009 @@ -1,2 +1,2 @@ /tomcat:883362 -/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,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,770809,77 0876,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,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889716,890139,890265,890349-890350,890417,891185-891187,891583,892198,8924 15,892555 +/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,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,770809,77 0876,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,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889716,890139,890265,890349-890350,890417,891185-891187,891583,8921 98,892415,892464,892555 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892773&r1=892772&r2=892773&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 2
DO NOT REPLY [Bug 47976] org.apache.catalina.startup.Catalina's usage() method is not complete
https://issues.apache.org/bugzilla/show_bug.cgi?id=47976 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2009-12-21 03:38:36 GMT --- This has been fixed in 6.0.x and will be included in 6.0.21 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: r892776 - in /tomcat/jk/trunk: native/common/jk_ajp_common.c native/common/jk_shm.h xdocs/miscellaneous/changelog.xml
Author: mturk Date: Mon Dec 21 11:46:29 2009 New Revision: 892776 URL: http://svn.apache.org/viewvc?rev=892776&view=rev Log: Fix #47222. Add ping_timeout to the shared memory Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c tomcat/jk/trunk/native/common/jk_shm.h tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=892776&r1=892775&r2=892776&view=diff == --- tomcat/jk/trunk/native/common/jk_ajp_common.c (original) +++ tomcat/jk/trunk/native/common/jk_ajp_common.c Mon Dec 21 11:46:29 2009 @@ -1009,6 +1009,7 @@ aw->cache_timeout = aw->s->cache_timeout; aw->connect_timeout = aw->s->connect_timeout; +aw->ping_timeout = aw->s->ping_timeout; aw->reply_timeout = aw->s->reply_timeout; aw->prepost_timeout = aw->s->prepost_timeout; aw->recovery_opts = aw->s->recovery_opts; @@ -1056,6 +1057,7 @@ aw->s->cache_timeout = aw->cache_timeout; aw->s->connect_timeout = aw->connect_timeout; +aw->s->ping_timeout = aw->ping_timeout; aw->s->reply_timeout = aw->reply_timeout; aw->s->prepost_timeout = aw->prepost_timeout; aw->s->recovery_opts = aw->recovery_opts; Modified: tomcat/jk/trunk/native/common/jk_shm.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.h?rev=892776&r1=892775&r2=892776&view=diff == --- tomcat/jk/trunk/native/common/jk_shm.h (original) +++ tomcat/jk/trunk/native/common/jk_shm.h Mon Dec 21 11:46:29 2009 @@ -85,6 +85,7 @@ /* Configuration data mirrored from ajp_worker */ int cache_timeout; int connect_timeout; +int ping_timeout; int reply_timeout; int prepost_timeout; unsigned int recovery_opts; Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892776&r1=892775&r2=892776&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 11:46:29 2009 @@ -44,6 +44,10 @@ +47222: Status: Add ping_timeout to the shared memory +and allow dynamic configuration. (mturk) + + 46632: Httpd: Do not register child cleanup with none of our pools. (mturk) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47963] HTTP status reason-phrase contains illegal characters in Japanese locale
https://issues.apache.org/bugzilla/show_bug.cgi?id=47963 --- Comment #5 from Mark Thomas 2009-12-21 03:46:42 GMT --- This has been fixed in 6.0.x and will be included in 6.0.21 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: r892777 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/jk/common/ java/org/apache/tomcat/util/http/ java/org/apache/tomcat/util/h
Author: markt
Date: Mon Dec 21 11:46:42 2009
New Revision: 892777
URL: http://svn.apache.org/viewvc?rev=892777&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47963
Prevent use of non-RFC2616 compliant custom status messages
Added:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties
(with props)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.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/tomcat/util/http/HttpMessages.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_fr.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892777&r1=892776&r2=892777&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 11:46:42 2009
@@ -329,9 +329,3 @@
http://svn.apache.org/viewvc?rev=892341&view=rev
+1: markt, rjung
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47963
- Prevent use of non-RFC2616 compliant custom status messages
- http://people.apache.org/~markt/patches/2009-12-21-bug47963.patch
- +1: markt, kkolinko, rjung
- -1:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=892777&r1=892776&r2=892777&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Mon
Dec 21 11:46:42 2009
@@ -953,13 +953,12 @@
// HTTP header contents
responseHeaderMessage.appendInt(response.getStatus());
String message = null;
-if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER &&
+HttpMessages.isSafeInHttpHeader(response.getMessage())) {
message = response.getMessage();
}
if (message == null){
message = HttpMessages.getMessage(response.getStatus());
-} else {
-message = message.replace('\n', ' ').replace('\r', ' ');
}
if (message == null) {
// mod_jk + httpd 2.x fails with a null status message - bug 45026
Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=892777&r1=892776&r2=892777&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Mon Dec
21 11:46:42 2009
@@ -958,13 +958,12 @@
// HTTP header contents
responseHeaderMessage.appendInt(response.getStatus());
String message = null;
-if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
+if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER &&
+HttpMessages.isSafeInHttpHeader(response.getMessage())) {
message = response.getMessage();
}
if (message == null){
message = HttpMessages.getMessage(response.getStatus());
-} else {
-message = message.replace('\n', ' ').replace('\r', ' ');
}
if (message == null) {
// mod_jk + httpd 2.x fails with a null status message - bug 45026
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=892777&r1=892776&r2=892777&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
Mon Dec 21 11:46:42 2009
@@
DO NOT REPLY [Bug 47222] Changes made to ping_timeout via Status Worker not synced across Apache Children
https://issues.apache.org/bugzilla/show_bug.cgi?id=47222 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mladen Turk 2009-12-21 03:47:10 UTC --- Fixed in the SVN by adding ping_timeout to the shared memory -- 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: r892787 - in /tomcat/jk/trunk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml
Author: mturk
Date: Mon Dec 21 12:02:54 2009
New Revision: 892787
URL: http://svn.apache.org/viewvc?rev=892787&view=rev
Log:
Fix #47224 by invalidating endoint cache on address change
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=892787&r1=892786&r2=892787&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Mon Dec 21 12:02:54 2009
@@ -1066,9 +1066,18 @@
aw->s->max_packet_size = aw->max_packet_size;
aw->s->h.sequence = aw->sequence;
if (aw->s->addr_sequence != aw->addr_sequence) {
+unsigned int i;
aw->s->addr_sequence = aw->addr_sequence;
strncpy(aw->s->host, aw->host, JK_SHM_STR_SIZ);
aw->s->port = aw->port;
+for (i = 0; i < aw->ep_cache_sz; i++) {
+/* Close all connections in the cache */
+if (aw->ep_cache[i] && IS_VALID_SOCKET(aw->ep_cache[i]->sd)) {
+int sd = aw->ep_cache[i]->sd;
+aw->ep_cache[i]->sd = JK_INVALID_SOCKET;
+jk_shutdown_socket(sd, l);
+}
+}
}
if (locked == JK_FALSE)
jk_shm_unlock();
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892787&r1=892786&r2=892787&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 12:02:54 2009
@@ -44,6 +44,11 @@
+47224: Status: When address gets changed invalidate
+all opened sockets in the endpoint cache. This will cause new
+backend connections to get opened using new address. (mturk)
+
+
47222: Status: Add ping_timeout to the shared memory
and allow dynamic configuration. (mturk)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47224] Hostname and Port Changes from Status Worker do not affect new connections either
https://issues.apache.org/bugzilla/show_bug.cgi?id=47224 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mladen Turk 2009-12-21 04:04:06 UTC --- Fixed in the SVN by actually invalidating the endpoint cache, so even already connected sockets in the cache will be disconnected allowing new connections with new address -- 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
Www-authenticate ...
Hi, My tomcat server is sending www-authenticate (digest) header but the header doesn't contain the algorithm field, which one is choosen by default? How do I specify it to use particular algorithm (sha1/md5)? -- View this message in context: http://old.nabble.com/Www-authenticate-...-tp26873232p26873232.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892795 - in /tomcat/trunk/java/org/apache/catalina: loader/LocalStrings.properties loader/WebappClassLoader.java startup/ContextConfig.java startup/ExpandWar.java startup/HostConfig.java
Author: markt
Date: Mon Dec 21 12:25:14 2009
New Revision: 892795
URL: http://svn.apache.org/viewvc?rev=892795&view=rev
Log:
Various related (un)deploy improvements including:
- better handling of failed (un)deployment
- adding checking for valid zip file entries that don't make sense in a WAR
file
- improved validation of WAR file names
- make sure error messages match the action
- the return from File.getCanonicalPath() may or may not return a final
separator for directories
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=892795&r1=892794&r2=892795&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Mon
Dec 21 12:25:14 2009
@@ -29,6 +29,7 @@
standardLoader.removeRepository=Removing repository {0}
standardLoader.starting=Starting this Loader
standardLoader.stopping=Stopping this Loader
+webappClassLoader.illegalJarPath=Illegal JAR entry detected with name {0}
webappClassLoader.jdbcRemoveFailed=JDBC driver de-registration failed
webappClassLoader.jdbcRemoveStreamError=Exception closing input stream during
JDBC driver de-registration
webappClassLoader.stopped=Illegal access: this web application instance has
been stopped already. Could not load {0}. The eventual following stack trace
is caused by an error thrown for debugging purposes as well as to attempt to
terminate the thread which caused the illegal access, and has no functional
impact.
@@ -39,6 +40,7 @@
webappClassLoader.clearThreadLocal=A web application created a ThreadLocal
with key of type [{0}] (value [{1}]) and a value of type [{2}] (value [{3}])
but failed to remove it when the web application was stopped. To prevent a
memory leak, the ThreadLocal has been forcibly removed.
webappClassLoader.clearThreadLocalFail=Failed to clear ThreadLocal references
webappClassLoader.stopThreadFail=Failed to terminate thread named [{0}]
+webappClassLoader.validationErrorJarPath=Unable to validate JAR entry with
name {0}
webappClassLoader.warnThread=A web application appears to have started a
thread named [{0}] but has failed to stop it. This is very likely to create a
memory leak.
webappClassLoader.wrongVersion=(unable to load class {0})
webappLoader.addRepository=Adding repository {0}
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=892795&r1=892794&r2=892795&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Dec
21 12:25:14 2009
@@ -362,7 +362,7 @@
* Path where resources loaded from JARs will be extracted.
*/
protected File loaderDir = null;
-
+protected String canonicalLoaderDir = null;
/**
* The PermissionCollection for each CodeSource for a web
@@ -577,6 +577,18 @@
*/
public void setWorkDir(File workDir) {
this.loaderDir = new File(workDir, "loader");
+if (loaderDir == null) {
+canonicalLoaderDir = null;
+} else {
+try {
+canonicalLoaderDir = loaderDir.getCanonicalPath();
+if (!canonicalLoaderDir.endsWith(File.separator)) {
+canonicalLoaderDir += File.separator;
+}
+} catch (IOException ioe) {
+canonicalLoaderDir = null;
+}
+}
}
/**
@@ -2514,6 +2526,18 @@
(".class"))) {
resourceFile = new File
(loaderDir, jarEntry2.getName());
+try {
+if
(!resourceFile.getCanonicalPath().startsWith(
+canonicalLoaderDir)) {
+throw new IllegalArgumentException(
+
sm.getString("webappClassLoader.illegalJarPath",
+jarEntry2.getName()));
+
Re: Www-authenticate ...
On 21/12/2009 12:16, insi wrote: > > Hi, > > My tomcat server is sending www-authenticate (digest) header but the header > doesn't contain the algorithm field, which one is choosen by default? > How do I specify it to use particular algorithm (sha1/md5)? Those are questions for the users list. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892798 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Dec 21 12:34:35 2009 New Revision: 892798 URL: http://svn.apache.org/viewvc?rev=892798&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=892798&r1=892797&r2=892798&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 12:34:35 2009 @@ -329,3 +329,8 @@ http://svn.apache.org/viewvc?rev=892341&view=rev +1: markt, rjung -1: + +* Various (un)deployment improvements + http://people.apache.org/~markt/patches/2009-12-21-deployment-improvements.patch + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892800 - in /tomcat/jk/trunk: native/common/jk_status.c xdocs/miscellaneous/changelog.xml
Author: mturk
Date: Mon Dec 21 12:39:29 2009
New Revision: 892800
URL: http://svn.apache.org/viewvc?rev=892800&view=rev
Log:
Fix #48305. Skip if property ends with .secret
Modified:
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=892800&r1=892799&r2=892800&view=diff
==
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Mon Dec 21 12:39:29 2009
@@ -4403,7 +4403,13 @@
for (i=0;i sizeof(".secret") &&
+strcmp(name + nl - 7, ".secret") == 0) {
+continue;
+}
+value = jk_map_value_at(init_data, i);
if (!value)
value = "(null)";
if (mime == JK_STATUS_MIME_HTML ||
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892800&r1=892799&r2=892800&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 12:39:29 2009
@@ -44,6 +44,10 @@
+48305: Status: Do not show secret property when
+doing dump. (mturk)
+
+
47224: Status: When address gets changed invalidate
all opened sockets in the endpoint cache. This will cause new
backend connections to get opened using new address. (mturk)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892801 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jfclere Date: Mon Dec 21 12:40:02 2009 New Revision: 892801 URL: http://svn.apache.org/viewvc?rev=892801&view=rev Log: My votes. 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=892801&r1=892800&r2=892801&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 12:40:02 2009 @@ -302,7 +302,7 @@ Return an error page rather than a zero length 200 response if the forward to the login or error page fails during FORM authentication http://svn.apache.org/viewvc?rev=889606&view=rev - +1: markt, rjung + +1: markt, rjung, jfclere -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774 @@ -332,5 +332,5 @@ * Various (un)deployment improvements http://people.apache.org/~markt/patches/2009-12-21-deployment-improvements.patch - +1: markt + +1: markt, jfclere -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48305] mod_jk - JK Status Manager page Dump shows my secret
https://issues.apache.org/bugzilla/show_bug.cgi?id=48305 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mladen Turk 2009-12-21 04:40:08 UTC --- Fixed in the SVN. Any property ending with .secret will not be shown in dump -- 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: r892803 - in /tomcat/jk/trunk: native/common/jk_ajp_common.c xdocs/miscellaneous/changelog.xml
Author: mturk
Date: Mon Dec 21 12:55:02 2009
New Revision: 892803
URL: http://svn.apache.org/viewvc?rev=892803&view=rev
Log:
Fix #48276. Just like with setting port to 0, if the resolve fails, mark the
worker as disabled
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=892803&r1=892802&r2=892803&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Mon Dec 21 12:55:02 2009
@@ -2575,6 +2575,13 @@
jk_log(l, JK_LOG_ERROR,
"worker %s can't resolve tomcat address %s",
p->name, p->host);
+p->s->port = p->port = 0;
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+ "worker %s contact is disabled",
+ p->name);
+JK_TRACE_EXIT(l);
+return JK_TRUE;
}
else {
p->s->port = p->port = 0;
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=892803&r1=892802&r2=892803&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Dec 21 12:55:02 2009
@@ -44,6 +44,10 @@
+48276: When worker contact cannot be resolved mark the
+worker as disabled instead failing to start the server. (mturk)
+
+
48305: Status: Do not show secret property when
doing dump. (mturk)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892804 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/authenticator/FormAuthenticator.java java/org/apache/catalina/authenticator/LocalStrings.properties webapps/docs/
Author: markt Date: Mon Dec 21 12:56:09 2009 New Revision: 892804 URL: http://svn.apache.org/viewvc?rev=892804&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47537 Return an error page rather than a zero length 200 response if the forward to the login or error page fails during FORM authentication Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 21 12:56:09 2009 @@ -1,2 +1,2 @@ /tomcat:883362 -/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,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,770809,77 0876,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,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889716,890139,890265,890349-890350,890417,891185-891187,891583,8921 98,892415,892464,892555 +/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,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,770809,77 0876,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,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889606,889716,890139,890265,890349-890350,890417,891185-891187,8915 83,892198,892415,892464,892555 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?re
DO NOT REPLY [Bug 48276] If the tomcat server cannot be resolved, apachectl configtest passes, but apachectl graceful fails
https://issues.apache.org/bugzilla/show_bug.cgi?id=48276 Mladen Turk changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mladen Turk 2009-12-21 04:56:18 UTC --- Fixed in the SVN. Since status worker now allows to change the contact address at runtime we can just disable the worker for which address resolution fails. The [ERROR] will be still logged however. -- 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 47537] Empty response when forward to login page fails
https://issues.apache.org/bugzilla/show_bug.cgi?id=47537 --- Comment #2 from Mark Thomas 2009-12-21 04:56:21 GMT --- This has been fixed in 6.0.x and will be included in 6.0.21 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: r892805 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Dec 21 12:57:16 2009 New Revision: 892805 URL: http://svn.apache.org/viewvc?rev=892805&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=892805&r1=892804&r2=892805&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 12:57:16 2009 @@ -325,5 +325,6 @@ * Various (un)deployment improvements http://people.apache.org/~markt/patches/2009-12-21-deployment-improvements.patch - +1: markt, jfclere + +1: markt, jfclere, kkolinko -1: + kkolinko: s/canoncial/canonical/ in a comment - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892811 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: markt
Date: Mon Dec 21 13:19:58 2009
New Revision: 892811
URL: http://svn.apache.org/viewvc?rev=892811&view=rev
Log:
Fix comment typo
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=892811&r1=892810&r2=892811&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Mon Dec 21
13:19:58 2009
@@ -777,7 +777,7 @@
canonicalDocBase =
(new File(docBase.toString())).getCanonicalPath();
-// If the canoncialDocBase ends with File.separator, add one to
+// If the canonicalDocBase ends with File.separator, add one to
// docBase before they are compared
if (canonicalDocBase.endsWith(File.separator)) {
docBase.append(File.separator);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892812 - /tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Author: kkolinko
Date: Mon Dec 21 13:20:01 2009
New Revision: 892812
URL: http://svn.apache.org/viewvc?rev=892812&view=rev
Log:
Remove unneeded line from the method that normalizes decodedURI.
The line "uriBC.setBytes(b, start, end);" is wrong, as it should have been
"uriBC.setBytes(b, start, end - start);". I suppose that it worked because in
the only place that calls this normalize() method the value of 'start' was
always equal to zero.
Instead of fixing, I am removing that line, because it actually is not needed
there at all, thanks to the uriBC.setEnd() calls above it.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
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=892812&r1=892811&r2=892812&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Dec
21 13:20:01 2009
@@ -832,8 +832,8 @@
public static boolean normalize(MessageBytes uriMB) {
ByteChunk uriBC = uriMB.getByteChunk();
-byte[] b = uriBC.getBytes();
-int start = uriBC.getStart();
+final byte[] b = uriBC.getBytes();
+final int start = uriBC.getStart();
int end = uriBC.getEnd();
// An empty URL is not acceptable
@@ -927,8 +927,6 @@
index = index2;
}
-uriBC.setBytes(b, start, end);
-
return true;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892813 - in /tomcat/jk/trunk/native/iis: Makefile.amd64 Makefile.ia64 Makefile.x86
Author: mturk Date: Mon Dec 21 13:25:10 2009 New Revision: 892813 URL: http://svn.apache.org/viewvc?rev=892813&view=rev Log: Link with commmode.obj so that default fflush is write to disk. This should resolve corrupted log file issues with isapi_redirect Modified: tomcat/jk/trunk/native/iis/Makefile.amd64 tomcat/jk/trunk/native/iis/Makefile.ia64 tomcat/jk/trunk/native/iis/Makefile.x86 Modified: tomcat/jk/trunk/native/iis/Makefile.amd64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=892813&r1=892812&r2=892813&view=diff == --- tomcat/jk/trunk/native/iis/Makefile.amd64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.amd64 Mon Dec 21 13:25:10 2009 @@ -98,7 +98,7 @@ "$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) + $(LINK32_FLAGS) $(LINK32_OBJS) commode.obj << IF EXIST $(OUTDIR)\isapi_redirect.manifest \ mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest -outputresource:$(OUTDIR)\isapi_redirect.dll;2 Modified: tomcat/jk/trunk/native/iis/Makefile.ia64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=892813&r1=892812&r2=892813&view=diff == --- tomcat/jk/trunk/native/iis/Makefile.ia64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.ia64 Mon Dec 21 13:25:10 2009 @@ -113,7 +113,7 @@ "$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) + $(LINK32_FLAGS) $(LINK32_OBJS) commode.obj << IF EXIST $(OUTDIR)\isapi_redirect.manifest \ mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest -outputresource:$(OUTDIR)\isapi_redirect.dll;2 Modified: tomcat/jk/trunk/native/iis/Makefile.x86 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=892813&r1=892812&r2=892813&view=diff == --- tomcat/jk/trunk/native/iis/Makefile.x86 (original) +++ tomcat/jk/trunk/native/iis/Makefile.x86 Mon Dec 21 13:25:10 2009 @@ -108,7 +108,7 @@ "$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) + $(LINK32_FLAGS) $(LINK32_OBJS) commode.obj << CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" $(CFLAGS) /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892814 - /tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Author: kkolinko
Date: Mon Dec 21 13:26:52 2009
New Revision: 892814
URL: http://svn.apache.org/viewvc?rev=892814&view=rev
Log:
First followup to r892341
Replace tabs with spaces in the lines changed in that revision.
No functional change.
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=892814&r1=892813&r2=892814&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Mon Dec 21 13:26:52 2009
@@ -790,7 +790,7 @@
return null;
Object swapInLock = null;
-
+
/*
* The purpose of this sync and these locks is to make sure that a
* session is only loaded once. It doesn't matter if the lock is
removed
@@ -800,78 +800,78 @@
* carry on.
*/
synchronized (this) {
- if (sessionSwapInLocks.containsKey(id)) {
- swapInLock = sessionSwapInLocks.get(id);
- } else {
- swapInLock = new Object();
- sessionSwapInLocks.put(id, swapInLock);
- }
- }
+if (sessionSwapInLocks.containsKey(id)) {
+swapInLock = sessionSwapInLocks.get(id);
+} else {
+swapInLock = new Object();
+sessionSwapInLocks.put(id, swapInLock);
+}
+}
Session session = null;
synchronized (swapInLock) {
- // First check to see if another thread has loaded the session
into
- // the manager
- session = sessions.get(id);
-
- if (session == null) {
- try {
- if (SecurityUtil.isPackageProtectionEnabled()){
- try {
- session = AccessController.doPrivileged(
- new PrivilegedStoreLoad(id));
- } catch (PrivilegedActionException ex) {
- Exception e = ex.getException();
- log.error(sm.getString(
-
"persistentManager.swapInException", id),
- e);
- if (e instanceof IOException){
- throw (IOException)e;
- } else if (e instanceof
ClassNotFoundException) {
- throw (ClassNotFoundException)e;
- }
- }
- } else {
-session = store.load(id);
- }
- } catch (ClassNotFoundException e) {
- String msg = sm.getString(
-
"persistentManager.deserializeError", id);
- log.error(msg, e);
- throw new IllegalStateException(msg, e);
- }
-
- if (session != null && !session.isValid()) {
- log.error(sm.getString(
- "persistentManager.swapInInvalid", id));
- session.expire();
- removeSession(id);
- session = null;
- }
-
- if (session != null) {
- if(log.isDebugEnabled())
-
log.debug(sm.getString("persistentManager.swapIn", id));
-
- session.setManager(this);
- // make sure the listeners know about it.
- ((StandardSession)session).tellNew();
- add(session);
- ((StandardSession)session).activate();
- // endAccess() to ensure timeouts happen
correctly.
- // access() to keep access count correct or it
will end up
- // negative
- session.access();
- session.endAccess();
- }
- }
+// First check to see if another thread has loaded the session into
+// the manager
+session = ses
svn commit: r892815 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/loader/ java/org/apache/catalina/startup/ webapps/docs/
Author: markt
Date: Mon Dec 21 13:27:57 2009
New Revision: 892815
URL: http://svn.apache.org/viewvc?rev=892815&view=rev
Log:
Various related (un)deploy improvements including:
- better handling of failed (un)deployment
- adding checking for valid zip file entries that don't make sense in a WAR
file
- improved validation of WAR file names
- make sure error messages match the action
- the return from File.getCanonicalPath() may or may not return a final
separator for directories
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties
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=892815&r1=892814&r2=892815&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 13:27:57 2009
@@ -322,9 +322,3 @@
http://svn.apache.org/viewvc?rev=892341&view=rev
+1: markt, rjung
-1:
-
-* Various (un)deployment improvements
-
http://people.apache.org/~markt/patches/2009-12-21-deployment-improvements.patch
- +1: markt, jfclere, kkolinko
- -1:
- kkolinko: s/canoncial/canonical/ in a comment
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=892815&r1=892814&r2=892815&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
Mon Dec 21 13:27:57 2009
@@ -28,8 +28,10 @@
standardLoader.removeRepository=Removing repository {0}
standardLoader.starting=Starting this Loader
standardLoader.stopping=Stopping this Loader
+webappClassLoader.illegalJarPath=Illegal JAR entry detected with name {0}
webappClassLoader.stopped=Illegal access: this web application instance has
been stopped already. Could not load {0}. The eventual following stack trace
is caused by an error thrown for debugging purposes as well as to attempt to
terminate the thread which caused the illegal access, and has no functional
impact.
webappClassLoader.readError=Resource read error: Could not load {0}.
+webappClassLoader.validationErrorJarPath=Unable to validate JAR entry with
name {0}
webappClassLoader.wrongVersion=(unable to load class {0})
webappLoader.addRepository=Adding repository {0}
webappLoader.deploy=Deploying class repositories to work directory {0}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=892815&r1=892814&r2=892815&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Mon Dec 21 13:27:57 2009
@@ -365,7 +365,7 @@
* Path where resources loaded from JARs will be extracted.
*/
protected File loaderDir = null;
-
+protected String canonicalLoaderDir = null;
/**
* The PermissionCollection for each CodeSource for a web
@@ -558,6 +558,18 @@
*/
public void setWorkDir(File workDir) {
this.loaderDir = new File(workDir, "loader");
+if (loaderDir == null) {
+canonicalLoaderDir = null;
+} else {
+try {
+canonicalLoaderDir = loaderDir.getCanonicalPath();
+if (!canonicalLoaderDir.endsWith(File.separator)) {
+canonicalLoaderDir += File.separator;
+}
+} catch (IOException ioe) {
+canonicalLoaderDir = null;
+}
+}
}
/**
@@ -2139,6 +2151,18 @@
(".class"))) {
resourceFile = new File
(loaderDir, jarEntry2.getName());
+try {
+if
(!resourceFile.getCanonicalPath().startsWith(
+canonicalLoaderDir)) {
+throw new IllegalArgumentException(
+
svn commit: r892817 - /tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Author: kkolinko
Date: Mon Dec 21 13:31:46 2009
New Revision: 892817
URL: http://svn.apache.org/viewvc?rev=892817&view=rev
Log:
Second followup to r892341
Small improvements, based on sebb's and my comments.
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=892817&r1=892816&r2=892817&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Mon Dec 21 13:31:46 2009
@@ -213,7 +213,7 @@
/**
* Sessions currently being swapped in and the associated locks
*/
-private Map sessionSwapInLocks =
+private final Map sessionSwapInLocks =
new HashMap();
@@ -794,15 +794,14 @@
/*
* The purpose of this sync and these locks is to make sure that a
* session is only loaded once. It doesn't matter if the lock is
removed
- * and then another thread enters this method and trues to load the
same
- * session. That thread will re-creates a swapIn lock for that session,
+ * and then another thread enters this method and tries to load the
same
+ * session. That thread will re-create a swapIn lock for that session,
* quickly find that the session is already in sessions, use it and
* carry on.
*/
synchronized (this) {
-if (sessionSwapInLocks.containsKey(id)) {
-swapInLock = sessionSwapInLocks.get(id);
-} else {
+swapInLock = sessionSwapInLocks.get(id);
+if (swapInLock == null) {
swapInLock = new Object();
sessionSwapInLocks.put(id, swapInLock);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892819 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Dec 21 13:38:54 2009 New Revision: 892819 URL: http://svn.apache.org/viewvc?rev=892819&view=rev Log: proposals 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=892819&r1=892818&r2=892819&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 13:38:54 2009 @@ -321,4 +321,16 @@ to create multiple session objects for a single session http://svn.apache.org/viewvc?rev=892341&view=rev +1: markt, rjung + +1: kkolinko: I am OK to commit r892341 as is, though r892817 proposed +below adds slight improvements -1: + Additional patches: + http://svn.apache.org/viewvc?rev=892814&view=rev (tabs replaced by spaces, no functional change) + http://svn.apache.org/viewvc?rev=892817&view=rev (sebb's/kkolinko's comments) + +1: kkolinko + -1: + +* Remove unneeded line from the method that normalizes decodedURI. + http://svn.apache.org/viewvc?rev=892812&view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: release 6.0.21
On Monday 21 December 2009 12:04:59 Mark Thomas wrote:
> On 21/12/2009 10:53, Rainer Frey wrote:
[...]
> > but I hoped that someone would take a
> > look at issue https://issues.apache.org/bugzilla/show_bug.cgi?id=48214
> > before a release is made
>
> I hadn't forgotten that one - I just hadn't got around to looking at it.
> I have a few ideas about what might be going on.
I assumed so, but I was afraid there wouldn't be time before the release.
> My guess is that you are relying on the auto-driver registration
> process. It is this process that triggers the memory leak so Tomcat now
> forcibly de-registers any drivers the JVM auto-registers.
I do, mostly on the presence of a static initializer block in the driver
class, as most drivers that we use do not yet implement JDBC4 fully.
What exactly is the memory leak? Is relying on the auto-registration
discouraged altogether, or is the service definition method of JDBC 4 safe?
> If you get a chance before I get to it later today, try using a context
> listener to register and de-register the driver when your app starts and
> stops and let us know how you get on.
I implemented the ServletContextListener below, and I don't get any exceptions
anymore. But I'm not sure about this thing. Are drivers required by spec to
provide a public parameterless constructor, and is it safe to create and
manage instances of a Driver on my own? Or do I need a separate instantiation
mechanism for each supported driver? I always regarded these things as
internal to the driver implementation. Maybe you were thinking of a different
approach to deregister and register a driver that I just don't see?
Here's the code (minus exception handling and logging):
public class JdbcDriverRegistrationListener implements ServletContextListener
{
private Driver driver;
public void contextInitialized( ServletContextEvent evt )
{
ServletContext context = evt.getServletContext();
String driverName = context.getInitParameter( "jdbc.driver" );
try
{
Class driverClass = (Class)Class.forName( driverName );
this.driver = driverClass.newInstance();
DriverManager.registerDriver( this.driver );
}
catch( Exception x )
{}
}
public void contextDestroyed( ServletContextEvent evt )
{
DriverManager.deregisterDriver( this.driver );
}
}
> Cheers,
>
> Mark
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48214] JDBC DriverManager: no suitable driver found after context reload
https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 --- Comment #2 from Mark Thomas 2009-12-21 06:13:16 GMT --- The problem you are seeing is a result of where you have placed the driver class, how DriverManager works internally and what Tomcat now does to prevent memory leaks. Your driver class is in CATALINA_HOME/lib so will be loaded by Tomcat's common class loader. The sequence of events is: - Tomcat starts - Your app starts - Your servlet is loaded and init() runs - The driver class is loaded due to the Class.forName() call - The common class loader loads the class - The class is registered with DriverManager but as DriverManager uses the context class loader, it is registered against your web application - The app runs for a while - The app is reloaded - Tomcat spots that DriverManager has registered the JDBC driver against the webapp class loader - Tomcat unregisters the JDBC driver to prevent a memory leak - Your app restarts - Your servlet is loaded and init() runs - The driver class is not loaded since it was loaded by the common class loader and is, therefore, still available - No class is loaded, so no driver is registered with DriverManager - init() fails when DriverManager can't find the driver There are many ways to fix this. The simplest are: - use a context listener to explicitly call DriverManager.register and deregister() - move the JDBC driver to WEB-INF/lib Tomcat 7 logs a message when unregistering the JDBC driver that provides a useful clue as to what is going on. Tomcat 6 doesn't do that. I'll propose the necessary changes for inclusion in Tomcat 6. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: release 6.0.21
On 21/12/2009 14:11, Rainer Frey (Inxmail GmbH) wrote: > On Monday 21 December 2009 12:04:59 Mark Thomas wrote: >> My guess is that you are relying on the auto-driver registration >> process. It is this process that triggers the memory leak so Tomcat now >> forcibly de-registers any drivers the JVM auto-registers. > > I do, mostly on the presence of a static initializer block in the driver > class, as most drivers that we use do not yet implement JDBC4 fully. > What exactly is the memory leak? Is relying on the auto-registration > discouraged altogether, or is the service definition method of JDBC 4 safe? The memory leak is caused by the DriverManager implementation. It holds a reference to the Driver. If the Driver was loaded by the web application then the Driver holds a reference to the WebappClassLoader. This in turn holds references to every class it has ever loaded. This can result in a significant PermGen leak on application reload. All the methods I have looked at do auto-registration but never de-registration. Given how DriverManager works that is a guaranteed memory leak on reload. In certain circumstances you can rely on auto-registration but it is safe to register and deregister yourself. >> If you get a chance before I get to it later today, try using a context >> listener to register and de-register the driver when your app starts and >> stops and let us know how you get on. > > I implemented the ServletContextListener below, and I don't get any > exceptions > anymore. That is exactly the sort of thing I had in mind. > But I'm not sure about this thing. Are drivers required by spec to > provide a public parameterless constructor, and is it safe to create and > manage instances of a Driver on my own? Most do, but it doesn't appear to be required. In your circumstances, you could use a LifecycleListener defined at the container level that just called Class.forName(String). In that scenario the common class loader would load the driver (as now) but it would also be the context class loader so DriverManager would pin the common class loader in memory which is not an issue (since it is never reloaded). In this case the memory leak protection code wouldn't kick in on webapp reload and all would be fine in your app. > Or do I need a separate instantiation > mechanism for each supported driver? I always regarded these things as > internal to the driver implementation. Maybe you were thinking of a different > approach to deregister and register a driver that I just don't see? I am afraid not. DriverManager and container environments can play together nicely but you do need to be very careful. Unfortunately, this is an issue that web app developers are not that familiar with. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892833 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Dec 21 14:29:19 2009 New Revision: 892833 URL: http://svn.apache.org/viewvc?rev=892833&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=892833&r1=892832&r2=892833&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 14:29:19 2009 @@ -327,10 +327,10 @@ Additional patches: http://svn.apache.org/viewvc?rev=892814&view=rev (tabs replaced by spaces, no functional change) http://svn.apache.org/viewvc?rev=892817&view=rev (sebb's/kkolinko's comments) - +1: kkolinko + +1: kkolinko, markt -1: * Remove unneeded line from the method that normalizes decodedURI. http://svn.apache.org/viewvc?rev=892812&view=rev - +1: kkolinko + +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892834 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Dec 21 14:30:46 2009 New Revision: 892834 URL: http://svn.apache.org/viewvc?rev=892834&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=892834&r1=892833&r2=892834&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 14:30:46 2009 @@ -334,3 +334,10 @@ http://svn.apache.org/viewvc?rev=892812&view=rev +1: kkolinko, markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 + Add logging when a context fails to unregister a JDBC driver. Don't unregister + the jdbc-obdc bridge driver that is loaded by the system classloader. + http://svn.apache.org/viewvc?view=revision&revision=885231 + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892835 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Dec 21 14:35:05 2009 New Revision: 892835 URL: http://svn.apache.org/viewvc?rev=892835&view=rev Log: Proposals 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=892835&r1=892834&r2=892835&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 14:35:05 2009 @@ -341,3 +341,15 @@ http://svn.apache.org/viewvc?view=revision&revision=885231 +1: markt -1: + +* Log threads that are started but not stopped by web applications + http://svn.apache.org/viewvc?view=revision&revision=885241 + http://svn.apache.org/viewvc?view=revision&revision=885260 + +1: markt + -1: + +* More memory leak protection: ThreadLocals, RMI references, optionally stopping + threads. + http://svn.apache.org/viewvc?view=revision&revision=885901 + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892837 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Dec 21 14:38:39 2009 New Revision: 892837 URL: http://svn.apache.org/viewvc?rev=892837&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=892837&r1=892836&r2=892837&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 14:38:39 2009 @@ -353,3 +353,8 @@ http://svn.apache.org/viewvc?view=revision&revision=885901 +1: markt -1: + +* Sync JreLeakPreventionListener with trunk + http://people.apache.org/~markt/patches/2009-12-21-JreLeakPreventionListener.patch + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: release 6.0.21
On 21/12/2009 10:12, jean-frederic clere wrote: > Hi, > > Later today I will tag and go for the release, make sure all the patches > you want to see in are committed :-) I've finished proposing everything I'd like to see in 6.0.21. I'll try and commit anything that gets enough votes before the tag. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892819 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 21/12/2009 13:38, kkoli...@apache.org wrote: > Author: kkolinko > Date: Mon Dec 21 13:38:54 2009 > New Revision: 892819 > > URL: http://svn.apache.org/viewvc?rev=892819&view=rev > Log: > proposals Thanks for doing these. Mark > > 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=892819&r1=892818&r2=892819&view=diff > == > --- tomcat/tc6.0.x/trunk/STATUS.txt (original) > +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 13:38:54 2009 > @@ -321,4 +321,16 @@ >to create multiple session objects for a single session >http://svn.apache.org/viewvc?rev=892341&view=rev >+1: markt, rjung > + +1: kkolinko: I am OK to commit r892341 as is, though r892817 proposed > +below adds slight improvements >-1: > + Additional patches: > + http://svn.apache.org/viewvc?rev=892814&view=rev (tabs replaced by spaces, > no functional change) > + http://svn.apache.org/viewvc?rev=892817&view=rev (sebb's/kkolinko's > comments) > + +1: kkolinko > + -1: > + > +* Remove unneeded line from the method that normalizes decodedURI. > + http://svn.apache.org/viewvc?rev=892812&view=rev > + +1: kkolinko > + -1: > > > > - > 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: r892843 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/config/context.xml
Author: rjung Date: Mon Dec 21 15:02:07 2009 New Revision: 892843 URL: http://svn.apache.org/viewvc?rev=892843&view=rev Log: Fix some comment typos. Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java tomcat/trunk/webapps/docs/config/context.xml Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=892843&r1=892842&r2=892843&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Dec 21 15:02:07 2009 @@ -748,7 +748,7 @@ private boolean clearReferencesStatic = false; /** - * Should Tomcat attempt to termiate threads that have been started by the + * Should Tomcat attempt to terminate threads that have been started by the * web application? Stopping threads is performed via the deprecated (for * good reason) Thread.stop() method and is likely to result in * instability. As such, enabling this should be viewed as an option of last 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=892843&r1=892842&r2=892843&view=diff == --- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Dec 21 15:02:07 2009 @@ -415,7 +415,7 @@ /** * Should Tomcat attempt to null out any static or final fields from loaded * classes when a web application is stopped as a work around for apparent - * garbage collection bugs and application coding errors. There have been + * garbage collection bugs and application coding errors? There have been * some issues reported with log4j when this option is true. Applications * without memory leaks using recent JVMs should operate correctly with this * option set to false. If not specified, the default value of @@ -424,9 +424,9 @@ private boolean clearReferencesStatic = false; /** - * Should Tomcat attempt to termiate threads that have been started by the + * Should Tomcat attempt to terminate threads that have been started by the * web application? Stopping threads is performed via the deprecated (for - * goo reason) Thread.stop() method and is likely to result in + * good reason) Thread.stop() method and is likely to result in * instability. As such, enabling this should be viewed as an option of last * resort in a development environment and is not recommended in a * production environment. If not specified, the default value of @@ -2007,9 +2007,9 @@ } // This method is deprecated and for good reason. This is -// very risky code but is only only option at this point +// very risky code but is the only option at this point. // A *very* good reason for apps to do this clean-up -// themselves +// themselves. thread.stop(); } } Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=892843&r1=892842&r2=892843&view=diff == --- tomcat/trunk/webapps/docs/config/context.xml (original) +++ tomcat/trunk/webapps/docs/config/context.xml Mon Dec 21 15:02:07 2009 @@ -340,12 +340,12 @@ -If true, Tomcat attempts to termiate threads that have -been started by the web application? Stopping threads is performed via +If true, Tomcat attempts to terminate threads that have +been started by the web application. Stopping threads is performed via the deprecated (for good reason) Thread.stop() method and is likely to result in instability. As such, enabling this should be viewed as an option of last resort in a development environment and is -not recommended in a production environment.If not specified, the +not recommended in a production environment. If not specified, the default value of false will be used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892844 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Mon Dec 21 15:04:37 2009 New Revision: 892844 URL: http://svn.apache.org/viewvc?rev=892844&view=rev Log: Vote, extend proposal, 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=892844&r1=892843&r2=892844&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 15:04:37 2009 @@ -327,20 +327,21 @@ Additional patches: http://svn.apache.org/viewvc?rev=892814&view=rev (tabs replaced by spaces, no functional change) http://svn.apache.org/viewvc?rev=892817&view=rev (sebb's/kkolinko's comments) - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Remove unneeded line from the method that normalizes decodedURI. http://svn.apache.org/viewvc?rev=892812&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 Add logging when a context fails to unregister a JDBC driver. Don't unregister the jdbc-obdc bridge driver that is loaded by the system classloader. http://svn.apache.org/viewvc?view=revision&revision=885231 - +1: markt + +1: markt, rjung -1: + rjung: "uncleareredReferenceJbdc" -> "unclearedReferenceJbdc" in two places * Log threads that are started but not stopped by web applications http://svn.apache.org/viewvc?view=revision&revision=885241 @@ -351,10 +352,14 @@ * More memory leak protection: ThreadLocals, RMI references, optionally stopping threads. http://svn.apache.org/viewvc?view=revision&revision=885901 + http://svn.apache.org/viewvc?view=revision&revision=892843 +1: markt -1: + rjung: I added the second commit after Mark proposed and votes. It is + a comment typo change only. Will need more time to vote on + the whole proposal though. * Sync JreLeakPreventionListener with trunk http://people.apache.org/~markt/patches/2009-12-21-JreLeakPreventionListener.patch - +1: markt + +1: markt, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892848 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Dec 21 15:10:55 2009 New Revision: 892848 URL: http://svn.apache.org/viewvc?rev=892848&view=rev Log: 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=892848&r1=892847&r2=892848&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Dec 21 15:10:55 2009 @@ -233,3 +233,8 @@ http://svn.apache.org/viewvc?rev=892612&view=rev +1: markt -1: + +* Remove unneeded line from the method that normalizes decodedURI. + http://svn.apache.org/viewvc?rev=892812&view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: release 6.0.21
On Monday 21 December 2009 15:23:42 Mark Thomas wrote: > The memory leak is caused by the DriverManager implementation. It holds > a reference to the Driver. If the Driver was loaded by the web > application then the Driver holds a reference to the WebappClassLoader. > This in turn holds references to every class it has ever loaded. This > can result in a significant PermGen leak on application reload. > > All the methods I have looked at do auto-registration but never > de-registration. Given how DriverManager works that is a guaranteed > memory leak on reload. In certain circumstances you can rely on > auto-registration but it is safe to register and deregister yourself. Thanks for the explanation, I understand now. > >> If you get a chance before I get to it later today, try using a context > >> listener to register and de-register the driver when your app starts and > >> stops and let us know how you get on. > > > > I implemented the ServletContextListener below, and I don't get any > > exceptions anymore. > > That is exactly the sort of thing I had in mind. Our product is a tomcat server with several (up to 25-40) copies of the same webapp (one for each customer). When this listener in one application would kick in, no other would be influenced, right? > > But I'm not sure about this thing. Are drivers required by spec to > > provide a public parameterless constructor, and is it safe to create and > > manage instances of a Driver on my own? > > Most do, but it doesn't appear to be required. In your circumstances, > you could use a LifecycleListener defined at the container level that > just called Class.forName(String). In that scenario the common class > loader would load the driver (as now) but it would also be the context > class loader so DriverManager would pin the common class loader in > memory which is not an issue (since it is never reloaded). In this case > the memory leak protection code wouldn't kick in on webapp reload and > all would be fine in your app. Actually each of those webapps can use one of 4 supported databases, but in most installations only one driver jar is actually available. Would you recommend this approach in this scenario rather than the context listener, or is there a drawback? Thanks for all your feedback on this, Mark. This is a great service to us! > Mark Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: release 6.0.21
On Monday 21 December 2009 15:23:42 Mark Thomas wrote: > Most do, but it doesn't appear to be required. In your circumstances, > you could use a LifecycleListener defined at the container level that > just called Class.forName(String). Hi Mark, what do you mean with "container level" here? Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892852 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jim Date: Mon Dec 21 15:44:43 2009 New Revision: 892852 URL: http://svn.apache.org/viewvc?rev=892852&view=rev Log: Testing completed... 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=892852&r1=892851&r2=892852&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 15:44:43 2009 @@ -288,14 +288,14 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997 Process changes for all naming contexts, not just the global one http://svn.apache.org/viewvc?rev=883134&view=rev - +1: markt, rjung + +1: markt, rjung, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47799 Unable to configure domain in Membership and DomainFilterInterceptor Patch provided by Keiichi Fujino http://svn.apache.org/viewvc?rev=883165&view=rev - +1: markt, rjung + +1: markt, rjung, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774 @@ -320,40 +320,40 @@ Prevent parallel requests for the same session causing the PersistentManager to create multiple session objects for a single session http://svn.apache.org/viewvc?rev=892341&view=rev - +1: markt, rjung + +1: markt, rjung, jim +1: kkolinko: I am OK to commit r892341 as is, though r892817 proposed below adds slight improvements -1: Additional patches: http://svn.apache.org/viewvc?rev=892814&view=rev (tabs replaced by spaces, no functional change) http://svn.apache.org/viewvc?rev=892817&view=rev (sebb's/kkolinko's comments) - +1: kkolinko, markt, rjung + +1: kkolinko, markt, rjung, jim -1: * Remove unneeded line from the method that normalizes decodedURI. http://svn.apache.org/viewvc?rev=892812&view=rev - +1: kkolinko, markt, rjung + +1: kkolinko, markt, rjung, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 Add logging when a context fails to unregister a JDBC driver. Don't unregister the jdbc-obdc bridge driver that is loaded by the system classloader. http://svn.apache.org/viewvc?view=revision&revision=885231 - +1: markt, rjung + +1: markt, rjung, jim -1: rjung: "uncleareredReferenceJbdc" -> "unclearedReferenceJbdc" in two places * Log threads that are started but not stopped by web applications http://svn.apache.org/viewvc?view=revision&revision=885241 http://svn.apache.org/viewvc?view=revision&revision=885260 - +1: markt + +1: markt, jim -1: * More memory leak protection: ThreadLocals, RMI references, optionally stopping threads. http://svn.apache.org/viewvc?view=revision&revision=885901 http://svn.apache.org/viewvc?view=revision&revision=892843 - +1: markt + +1: markt, jim -1: rjung: I added the second commit after Mark proposed and votes. It is a comment typo change only. Will need more time to vote on @@ -361,5 +361,5 @@ * Sync JreLeakPreventionListener with trunk http://people.apache.org/~markt/patches/2009-12-21-JreLeakPreventionListener.patch - +1: markt, rjung + +1: markt, rjung, jim -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: release 6.0.21
On 21/12/2009 15:13, Rainer Frey (Inxmail GmbH) wrote: > On Monday 21 December 2009 15:23:42 Mark Thomas wrote: >> The memory leak is caused by the DriverManager implementation. It holds >> a reference to the Driver. If the Driver was loaded by the web >> application then the Driver holds a reference to the WebappClassLoader. >> This in turn holds references to every class it has ever loaded. This >> can result in a significant PermGen leak on application reload. >> >> All the methods I have looked at do auto-registration but never >> de-registration. Given how DriverManager works that is a guaranteed >> memory leak on reload. In certain circumstances you can rely on >> auto-registration but it is safe to register and deregister yourself. > > Thanks for the explanation, I understand now. > If you get a chance before I get to it later today, try using a context listener to register and de-register the driver when your app starts and stops and let us know how you get on. >>> >>> I implemented the ServletContextListener below, and I don't get any >>> exceptions anymore. >> >> That is exactly the sort of thing I had in mind. > > Our product is a tomcat server with several (up to 25-40) copies of the same > webapp (one for each customer). When this listener in one application would > kick in, no other would be influenced, right? In your scenario, if the web app behaves the same way as the test case attached to the bug, you are likely to have issues. I think you'd need to use the container level lifecycle listener approach. > Actually each of those webapps can use one of 4 supported databases, but in > most installations only one driver jar is actually available. Would you > recommend this approach in this scenario rather than the context listener, or > is there a drawback? See above. For an example of a container level lifecycle listener take a look at this commit. That should give you the idea. http://svn.apache.org/viewvc?view=revision&revision=828196 Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892834 - /tomcat/tc6.0.x/trunk/STATUS.txt
2009/12/21 : > Author: markt > Date: Mon Dec 21 14:30:46 2009 > New Revision: 892834 > > URL: http://svn.apache.org/viewvc?rev=892834&view=rev > Log: > Proposal > > + > +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 > + Add logging when a context fails to unregister a JDBC driver. Don't > unregister > + the jdbc-obdc bridge driver that is loaded by the system classloader. > + http://svn.apache.org/viewvc?view=revision&revision=885231 > + +1: markt > + -1: What is so different with the OBDC bridge? I wonder whether you can test the class loader of that class to determine if it was loaded by the System class loader. Does it affect classes that are loaded through the Common classloader? a) if there is a datasource in b) if there is a datasource in and another in webapp's context - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892834 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 21/12/2009 15:59, Konstantin Kolinko wrote: > 2009/12/21 : >> Author: markt >> Date: Mon Dec 21 14:30:46 2009 >> New Revision: 892834 >> >> URL: http://svn.apache.org/viewvc?rev=892834&view=rev >> Log: >> Proposal >> >> + >> +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 >> + Add logging when a context fails to unregister a JDBC driver. Don't >> unregister >> + the jdbc-obdc bridge driver that is loaded by the system classloader. >> + http://svn.apache.org/viewvc?view=revision&revision=885231 >> + +1: markt >> + -1: > > What is so different with the OBDC bridge? I wonder whether you can > test the class loader of that class to determine if it was loaded by > the System class loader. Best I can tell, DriverManager treats it as a special case. You should be able to look at the class loader of the driver. I'll need to do some testing. > Does it affect classes that are loaded through the Common classloader? > a) if there is a datasource in > b) if there is a datasource in and another in webapp's > context It shouldn't but depending on configuration, it may be possible to configure a global resource but end up with a web app triggering the loading of the driver. That would cause issues and is worthy of further testing. On the plus-side, if anyone did get hit by that there are easy work-arounds. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892860 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml
Author: markt Date: Mon Dec 21 16:22:00 2009 New Revision: 892860 URL: http://svn.apache.org/viewvc?rev=892860&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997 Process changes for all naming contexts, not just the global one Patch provided by Michael Allman Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/NamingContextListener.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 21 16:22:00 2009 @@ -1,2 +1,2 @@ /tomcat:883362 -/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,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,770809,77 0876,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,883146,883177,883362,883565,884341,885038,885991,886019,888072,889363,889606,889716,890139,890265,890349-890350,890417,891185-891187,8915 83,892198,892415,892464,892555 +/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,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,770809,77 0876,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,883177,883362,883565,884341,885038,885991,886019,888072,889363,889606,889716,890139,890265,890349-890350,890417,891185-8911 87,891583,892198,892415,892464,892555 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892860&r1=892859&r2=892860&view=diff == ---
DO NOT REPLY [Bug 47997] NamingContextListener fails to add itself as a PropertyChangeListener to all namingResources
https://issues.apache.org/bugzilla/show_bug.cgi?id=47997 --- Comment #3 from Mark Thomas 2009-12-21 08:22:20 GMT --- This has been fixed in 6.0.x and will be included in 6.0.21 onwards. Thanks again for the patch. -- 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: r892864 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java java/org/apache/catalina/tribes/membership/McastService.ja
Author: markt Date: Mon Dec 21 16:26:07 2009 New Revision: 892864 URL: http://svn.apache.org/viewvc?rev=892864&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47799 Unable to configure domain in Membership and DomainFilterInterceptor Patch provided by Keiichi Fujino Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 21 16:26:07 2009 @@ -1,2 +1,2 @@ /tomcat:883362 -/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,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,770809,77 0876,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,883177,883362,883565,884341,885038,885991,886019,888072,889363,889606,889716,890139,890265,890349-890350,890417,891185-8911 87,891583,892198,892415,892464,892555 +/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,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,770809,77 0876,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,885991,886019,888072,889363,889606,889716,890139,890265,890349-890350,890417,8911 85-891187,891583,892198,892415,892464,892555 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS
DO NOT REPLY [Bug 47799] Domain does not work in Membership and DomainFilterInterceptor.
https://issues.apache.org/bugzilla/show_bug.cgi?id=47799 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2009-12-21 08:26:33 GMT --- This has been fixed in 6.0.x and will be included in 6.0.21 onwards. Thanks again for the patch. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892834 - /tomcat/tc6.0.x/trunk/STATUS.txt
2009/12/21 Mark Thomas :
> On 21/12/2009 15:59, Konstantin Kolinko wrote:
>> 2009/12/21 :
>>> Author: markt
>>> Date: Mon Dec 21 14:30:46 2009
>>> New Revision: 892834
>>>
>>> URL: http://svn.apache.org/viewvc?rev=892834&view=rev
>>> Log:
>>> Proposal
>>>
>>> +
>>> +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214
>>> + Add logging when a context fails to unregister a JDBC driver. Don't
>>> unregister
>>> + the jdbc-obdc bridge driver that is loaded by the system classloader.
>>> + http://svn.apache.org/viewvc?view=revision&revision=885231
>>> + +1: markt
>>> + -1:
>>
>> What is so different with the OBDC bridge? I wonder whether you can
>> test the class loader of that class to determine if it was loaded by
>> the System class loader.
>
> Best I can tell, DriverManager treats it as a special case. You should
> be able to look at the class loader of the driver. I'll need to do some
> testing.
I see DriverManager.loadInitialDriver().
As of 6u16 it
- looks for system property "jdbc.drivers" and splits it by colons
(':') and loads those classes
- looks for service providers for java.sql.Driver.class and loads those classes
>
>> Does it affect classes that are loaded through the Common classloader?
>> a) if there is a datasource in
>> b) if there is a datasource in and another in webapp's
>> context
>
> It shouldn't but depending on configuration, it may be possible to
> configure a global resource but end up with a web app triggering the
> loading of the driver. That would cause issues and is worthy of further
> testing. On the plus-side, if anyone did get hit by that there are easy
> work-arounds.
>
> Mark
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892834 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 21.12.2009 17:16, Mark Thomas wrote: On 21/12/2009 15:59, Konstantin Kolinko wrote: 2009/12/21: Author: markt Date: Mon Dec 21 14:30:46 2009 New Revision: 892834 URL: http://svn.apache.org/viewvc?rev=892834&view=rev Log: Proposal + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 + Add logging when a context fails to unregister a JDBC driver. Don't unregister + the jdbc-obdc bridge driver that is loaded by the system classloader. + http://svn.apache.org/viewvc?view=revision&revision=885231 + +1: markt + -1: What is so different with the OBDC bridge? I wonder whether you can test the class loader of that class to determine if it was loaded by the System class loader. Best I can tell, DriverManager treats it as a special case. You should be able to look at the class loader of the driver. I'll need to do some testing. Does it affect classes that are loaded through the Common classloader? a) if there is a datasource in b) if there is a datasource in and another in webapp's context It shouldn't but depending on configuration, it may be possible to configure a global resource but end up with a web app triggering the loading of the driver. That would cause issues and is worthy of further testing. On the plus-side, if anyone did get hit by that there are easy work-arounds. We already applied a lot of last minute patches. Maybe we don't need to put so much pressure into those more complex leak prevention patches for 6.0.21, and instead let JFC know, when the really important ones are done and he can proceed tagging etc. Since JFC is now in the boat as 6.0 RM, we might wan to do another release in the not so distant future? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892834 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 21/12/2009 16:28, Rainer Jung wrote: > We already applied a lot of last minute patches. Maybe we don't need to > put so much pressure into those more complex leak prevention patches for > 6.0.21, and instead let JFC know, when the really important ones are > done and he can proceed tagging etc. Since JFC is now in the boat as 6.0 > RM, we might wan to do another release in the not so distant future? WRT to JDBC-ODBC bridge stuff, the current JdbcLeakPrevention will break stuff that uses that driver. There may still be some edge cases but I believe we are better with this patch than without. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892864 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java java/org/apache/catalina/tribes/membership/McastServ
2009/12/21 : > Author: markt > Date: Mon Dec 21 16:26:07 2009 > New Revision: 892864 > > URL: http://svn.apache.org/viewvc?rev=892864&view=rev > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47799 > Unable to configure domain in Membership and DomainFilterInterceptor > Patch provided by Keiichi Fujino > Just a reminder: documentation has to be added/updated for this new configuration attributes: /config/cluster-interceptor.xml, cluster-membership.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892872 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/session/PersistentManagerBase.java webapps/docs/changelog.xml
Author: markt Date: Mon Dec 21 16:38:29 2009 New Revision: 892872 URL: http://svn.apache.org/viewvc?rev=892872&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47930 Prevent parallel requests for the same session causing the PersistentManager to create multiple session objects for a single session Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 21 16:38:29 2009 @@ -1,2 +1,2 @@ /tomcat:883362 -/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,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,770809,77 0876,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,885991,886019,888072,889363,889606,889716,890139,890265,890349-890350,890417,8911 85-891187,891583,892198,892415,892464,892555 +/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,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,770809,77 0876,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,885991,886019,888072,889363,889606,889716,890139,890265,890349-890350,890417,8911 85-891187,891583,892198,892341,892415,892464,892555,892814,892817 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892872&r1=892871&r2=892872&view=dif
svn commit: r892875 - /tomcat/native/trunk/KEYS
Author: hgomez Date: Mon Dec 21 16:40:41 2009 New Revision: 892875 URL: http://svn.apache.org/viewvc?rev=892875&view=rev Log: Add my GPG key Modified: tomcat/native/trunk/KEYS Modified: tomcat/native/trunk/KEYS URL: http://svn.apache.org/viewvc/tomcat/native/trunk/KEYS?rev=892875&r1=892874&r2=892875&view=diff == --- tomcat/native/trunk/KEYS (original) +++ tomcat/native/trunk/KEYS Mon Dec 21 16:40:41 2009 @@ -326,3 +326,62 @@ dXioomESUJeZzxMYdyk8nOiIeQ== =UD4Y -END PGP PUBLIC KEY BLOCK- + +pub 4096R/BD0A8037 2009-12-04 +Empreinte de la clé = 1473 7EB2 565F E85D B941 6210 42AE CE61 BD0A 8037 +uid Henri Gomez +sig 3BD0A8037 2009-12-04 Henri Gomez +sub 4096R/B24EED10 2009-12-04 +sig BD0A8037 2009-12-04 Henri Gomez + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG/MacGPG2 v2.0.12 (Darwin) + +mQINBEsZDQYBEADKnASDGPuXgJTztFmeJahK0cr7XG5Fjy3jAF58NKWjQMR/09kY +lSMhOsatXLZCDVjyq/CyvXdGDxRZCrEmvcykf03Q5JutkUQEqBhMZXC7yu5EvUEK +iFRSAM1m1thJqEw61pPlSVDyPIdBogO3zai24PP6fgPGLxxfWBhprM9BwQpYBWSn +cpXzQr3F+QLPCCTwRZubX9wO73hqZ7QC85+4t4FbG85wVr98FgzLLnapSdnFWnad +nuKNZqSwhmsg1X7DbRk/DN63z0kMOXtVfVDxw21GAtJHPu0s6j6Z0qaMK7+tlilv +6WmB15cfSd/bu3aTTK6gXQ9RdpjLghMKmSfT7urHh42BXuYFQ2XNS6ASeO+eDY55 +OZZD+tfjdn2tGVcsvDM3++SnGmuQ5AfZ59zzP6xIgK0yrfK+9cdYuv0zmmf7k5Yl +AIKiUAukHRB8P5gDyooQlqSyTXII//dNcQiKXUa0y8mWDEFO9v0bgkOYEj8rIICb +x2g8hWbKi2iIIOaI1Z4VkYQ1k7/yYqlXRLBt5ypvjytjx4GR2ioCn6uHaroQrRwh +WETUJoPiQ+OjQjdxCzcDNEtN3Z7RuxEqQC6K2cwZUd/+vvyLLOkj7GLNcgNpiQSJ ++5zMY7Y0y1nKMYd2rmooW1nFJYHROa+Vy+wFZViN1vg9lVhTVs2vT9bgMwARAQAB +tCNIZW5yaSBHb21leiA8aGVucmkuZ29tZXpAZ21haWwuY29tPokCNgQTAQIAIAUC +SxkNBgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEEKuzmG9CoA3cD8P/0eL +NxENYutmiu5hDvkfEB6p7TCLY2hNnwK4twJ9ZOHLRgOYazKvviRwQP3bvM345RNJ +OYmEqK+WbwRBcArJQ/TGaxFtYGgyN/rDE2Tj1D18eVNUK97M3SZX6XIV6c0SkyQG +TL09GxMceHWT7s+UkcZ92/BYeMLrTIiAVhDPAL7/3UC7DiEXAw3TRmM1zxqDsBOY +NWXh6TMs4lWCH9HW9xuAfhjk2BJ8kCaiLFmPJLMMvVqdKIjdptgCMDHlGOZFIHva +CwtVShg+QB8VNOJZWhMrLPsGK7d+V1z67yEIacdLjRS/ChSmJhzH9k20oJ/aL/5w +i6iEOIiD4l6Gj0edlLoeElWlM4OxdUaTl0Oq5NksVNwNVDjk6X+QqOpmU5FrTQ2u +FAOik7wXl67ZrWBoLtmQZcCemckz8qrKLaAKaN7Wvmu2q4KUunorg2bhDzA7qU7o +u1lFmNoafHlKU2G3VDzt3VlU4XU69BrwARayWbbOBOmUTRRG9oGZLmaHiyHNU59G +flqtinM9bAQUc6q6lMDdEpbfSek5KETHS2Yfmt547WdUxUMW90PsnhXHxNvjOfNI +Sb3ndi0wDU53o5ja5GFE0rj2Mq3lVsgKdFhJk6huwIIeglpT6bAJA2njrS6/7a5z +1uZLBF7h9WLotiKiO6LDgEcyjFRmqB68E3T8f7yMuQINBEsZDQYBEADHF+JycXfB +6cv3FVqlVsH2W7pNMLSlsn7TP82OU4dsNk4RCaobPIqxd5+pZcyJIxn9UulR2OUv +kOsMHfGuGXyLVijz5Omjk07RxTdMCwBIdfZ3kV8Z8E1gIoss4Sc0ORHzZJZ5HyOX +IiKshp/LHz7jz3TBsMPTMkfWyNZxGR/QfsfDHxQdez0loFhvSPNaQF8CA6bhdWbR +3Otv4KL/kijeBTLpRnfImYrV5etgtuTCY9Jn4UeapT3jYTyuvPdD883U0s/hzfRJ +GGFe876wodaShqw/r5ahJSUdnLISW9MPJ/egniDMullXT4UDWtmRFl8PMXV+R5Mw +ekCUQ85l/e7deKHZ4sqj7bZDCvdVyslBDNLqiHX9J9t4aGXAnN0gPPTTogtIJNQQ +H9hBB/Z4yCSwVvzsD35vzxBsSRd6ssVRbjlKCilVlge9BGJZiiMp8NrVP67/IIV9 +0BQpxGIoWY2mvmF4qQuyax/nqu3xxAK+YfBDxtmIVUYcX8YXOa3vthN2DYBdnm5n +7+beljnfXZS9DzEN0hw8KN7VnyNdiycjumijUBWtLWaJWu1XuQJMh6bxRGqeLyZv +fZTEUm/r9R2pIQd746TLFBGYccQIgnAdHIeFVX4OikFMeledxQ0Sg1vMlVsEzme9 +JeDoxeRJvRGDfvZWp/KBAnuCpcOKYd40OwARAQABiQIfBBgBAgAJBQJLGQ0GAhsM +AAoJEEKuzmG9CoA3mJMP/A53Vha8X89HCo765+pMC+oIxpHwgUHq7FLU0mofxjP1 +KRcnOOnVLJLGbpSiWxSHMZotADiqbf6NvErJG7Yalo3YIM7rbwGYpG2P0mYOvI85 +9qMZIcc5P4AcxRQMTpbfSzA5FsaOyBb1iA9mqb8hnDHUoQdEb+MA7iMP11jWUdSR +mjarTpRAKt8IdgcuRKYtbjIrg05XR+EbXEEjvFuZV6gK9e3W4GJ8A+2GEtgcTvmZ +drqdJrqRsggWxz9YjGj5o4a8LNV3/LBcqvPd1Ib+L/vzy4JSb2XX+a5CJg6nad2K +GI70bvGjSDdBNazidSiYtNwKXuJAghgGcXrFC6NU/A7mlO2qJoR3QCcJQ2BnLEB2 +B3onzl4uPnr6e4ijhCt7E2XJlOFX1BPqoU0ntOvCtRMzyPh1oI+/h5My8YdcHmmA +Aa3XOTne6qbyM/UQJOnUpDm8dezTagJm7HDBmlxi+XiMGA/0od/8CG3A1EOKjApc +19OavHf2lDgsncwhqp7tOmXheKuM1CZLwCgqLUc0XMVmMDrxOn0/mA2lOl1G9vWQ +ItrLhDfYc+O/XWwVLMelnUJv8fR/mCvo9nCoPg2kq5d2QKA+jDTXmsqo94tAqUZH +2/RvjGCTBnp0HeErc1325j2pAghxmzxY0xdKIyRO6gaou0rdNNxn0L6fE4c8ZAet +=rvjp +-END PGP PUBLIC KEY BLOCK- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892878 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/JdbcLeakPrevention.java java/org/apache/catalina/loader/LocalStrings.properties java/org/apache/catalina/l
Author: markt Date: Mon Dec 21 16:47:27 2009 New Revision: 892878 URL: http://svn.apache.org/viewvc?rev=892878&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 Add logging when a context fails to unregister a JDBC driver. Don't unregister the jdbc-obdc bridge driver that is loaded by the system classloader. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 21 16:47:27 2009 @@ -1,2 +1,2 @@ /tomcat:883362 -/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,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,770809,77 0876,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,885991,886019,888072,889363,889606,889716,890139,890265,890349-890350,890417,8911 85-891187,891583,892198,892341,892415,892464,892555,892814,892817 +/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,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,770809,77 0876,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,885991,886019,888072,889363,889606,889716,890139,890265,890349-890350,8904 17,891185-891187,891583,892198,892341,892415,892464,892555,892814,892817 Mod
Re: svn commit: r892834 - /tomcat/tc6.0.x/trunk/STATUS.txt
2009/12/21 Mark Thomas : > On 21/12/2009 16:28, Rainer Jung wrote: >> We already applied a lot of last minute patches. Maybe we don't need to >> put so much pressure into those more complex leak prevention patches for >> 6.0.21, and instead let JFC know, when the really important ones are >> done and he can proceed tagging etc. Since JFC is now in the boat as 6.0 >> RM, we might wan to do another release in the not so distant future? > > WRT to JDBC-ODBC bridge stuff, the current JdbcLeakPrevention will break > stuff that uses that driver. There may still be some edge cases but I > believe we are better with this patch than without. > That is unfortunate. I would expect that some other drivers might be broken as well. Maybe we can wait a couple of days? Regarding the first threads patch (r885260): I expect those thread group names to be implementation-dependent. Maybe a) we can scan what thread groups exist when Tomcat is started, b) we can provide means to customize that list, and/or to disable this feature altogether, c) show warns instead of errors. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892879 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml webapps/docs/config/listeners.xml
Author: markt
Date: Mon Dec 21 16:50:18 2009
New Revision: 892879
URL: http://svn.apache.org/viewvc?rev=892879&view=rev
Log:
Sync JreLeakPreventionListener with trunk
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=892879&r1=892878&r2=892879&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 16:50:18 2009
@@ -322,8 +322,3 @@
rjung: I added the second commit after Mark proposed and votes. It is
a comment typo change only. Will need more time to vote on
the whole proposal though.
-
-* Sync JreLeakPreventionListener with trunk
-
http://people.apache.org/~markt/patches/2009-12-21-JreLeakPreventionListener.patch
- +1: markt, rjung, jim
- -1:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=892879&r1=892878&r2=892879&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Mon Dec 21 16:50:18 2009
@@ -18,6 +18,8 @@
package org.apache.catalina.core;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
@@ -49,9 +51,9 @@
*/
public class JreMemoryLeakPreventionListener implements LifecycleListener {
-protected static final Log log =
+private static final Log log =
LogFactory.getLog(JreMemoryLeakPreventionListener.class);
-protected static final StringManager sm =
+private static final StringManager sm =
StringManager.getManager(Constants.Package);
/**
@@ -59,7 +61,7 @@
* sun.awt.AppContext.getAppContext() is triggered by a web
* application. Defaults to true.
*/
-protected boolean appContextProtection = true;
+private boolean appContextProtection = true;
public boolean isAppContextProtection() { return appContextProtection; }
public void setAppContextProtection(boolean appContextProtection) {
this.appContextProtection = appContextProtection;
@@ -71,7 +73,7 @@
* {...@link URLConnection}s, regardless of type. Defaults to
* true.
*/
-protected boolean urlCacheProtection = true;
+private boolean urlCacheProtection = true;
public boolean isUrlCacheProtection() { return urlCacheProtection; }
public void setUrlCacheProtection(boolean urlCacheProtection) {
this.urlCacheProtection = urlCacheProtection;
@@ -82,12 +84,25 @@
* particularly nasty as profilers (at least YourKit and Eclipse MAT) don't
* identify any GC roots related to this.
*/
-protected boolean xmlParsingProtection = true;
+private boolean xmlParsingProtection = true;
public boolean isXmlParsingProtection() { return xmlParsingProtection; }
public void setXmlParsingProtection(boolean xmlParsingProtection) {
this.xmlParsingProtection = xmlParsingProtection;
}
+/**
+ * Protect against the memory leak caused when the first call to
+ * sun.misc.GC.requestLatency(long) is triggered by a web
+ * application. This first call will start a GC Daemon thread with the
+ * thread's context class loader configured to be the web application class
+ * loader. Defaults to true.
+ */
+private boolean gcDaemonProtection = true;
+public boolean isGcDaemonProtection() { return gcDaemonProtection; }
+public void setGcDaemonProtection(boolean gcDaemonProtection) {
+this.gcDaemonProtection = gcDaemonProtection;
+}
+
public void lifecycleEvent(LifecycleEvent event) {
// Initialise these classes when Tomcat starts
if (Lifecycle.INIT_EVENT.equals(event.getType())) {
@@ -149,8 +164,42 @@
try {
factory.newDocumentBuilder();
} catch (ParserConfigurationException e) {
-log.error(sm.getString(
-"jreLeakListener.xmlParseFail"), e);
+log.error(sm.getString("jreLeakListener.xmlParseFail"), e);
+}
+}
+
+/*
+ * Several components end up calling:
+ * sun.misc.GC.requestLatency(long)
+ *
+
Re: svn commit: r892834 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 21/12/2009 16:49, Konstantin Kolinko wrote: > 2009/12/21 Mark Thomas : >> On 21/12/2009 16:28, Rainer Jung wrote: >>> We already applied a lot of last minute patches. Maybe we don't need to >>> put so much pressure into those more complex leak prevention patches for >>> 6.0.21, and instead let JFC know, when the really important ones are >>> done and he can proceed tagging etc. Since JFC is now in the boat as 6.0 >>> RM, we might wan to do another release in the not so distant future? >> >> WRT to JDBC-ODBC bridge stuff, the current JdbcLeakPrevention will break >> stuff that uses that driver. There may still be some edge cases but I >> believe we are better with this patch than without. >> > That is unfortunate. > I would expect that some other drivers might be broken as well. Looking at the source for DriverManager, you may well be correct. Fix should be simple though. I should have something to propose quite quickly. > Maybe we can wait a couple of days? I'd rather not wait too long. > Regarding the first threads patch (r885260): > I expect those thread group names to be implementation-dependent. Probably. > Maybe a) we can scan what thread groups exist when Tomcat is started, > b) we can provide means to customize that list, and/or to disable > this feature altogether, c) show warns instead of errors. All possible options. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: release 6.0.21
On 21/12/2009 15:59, Mark Thomas wrote: > On 21/12/2009 15:13, Rainer Frey (Inxmail GmbH) wrote: >> On Monday 21 December 2009 15:23:42 Mark Thomas wrote: >>> The memory leak is caused by the DriverManager implementation. It holds >>> a reference to the Driver. If the Driver was loaded by the web >>> application then the Driver holds a reference to the WebappClassLoader. >>> This in turn holds references to every class it has ever loaded. This >>> can result in a significant PermGen leak on application reload. >>> >>> All the methods I have looked at do auto-registration but never >>> de-registration. Given how DriverManager works that is a guaranteed >>> memory leak on reload. In certain circumstances you can rely on >>> auto-registration but it is safe to register and deregister yourself. >> >> Thanks for the explanation, I understand now. >> > If you get a chance before I get to it later today, try using a context > listener to register and de-register the driver when your app starts and > stops and let us know how you get on. I implemented the ServletContextListener below, and I don't get any exceptions anymore. >>> >>> That is exactly the sort of thing I had in mind. >> >> Our product is a tomcat server with several (up to 25-40) copies of the same >> webapp (one for each customer). When this listener in one application >> would >> kick in, no other would be influenced, right? > > In your scenario, if the web app behaves the same way as the test case > attached to the bug, you are likely to have issues. I think you'd need > to use the container level lifecycle listener approach. > >> Actually each of those webapps can use one of 4 supported databases, but in >> most installations only one driver jar is actually available. Would you >> recommend this approach in this scenario rather than the context listener, >> or >> is there a drawback? > > See above. > > For an example of a container level lifecycle listener take a look at > this commit. That should give you the idea. > > http://svn.apache.org/viewvc?view=revision&revision=828196 This might be complete nonsense :) Konstantin's comments about the JDBC-ODBC bridge got me looking at this more closely. There was a bug in the de-registration code that mean it was a little over-zealous on its clean up. Patch to trunk and proposal for 6.0.21 to follow shortly. With the patch in place, your original code should work happily. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892887 - /tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
Author: markt
Date: Mon Dec 21 17:15:41 2009
New Revision: 892887
URL: http://svn.apache.org/viewvc?rev=892887&view=rev
Log:
Only unload JDBC drivers this web app loaded.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java?rev=892887&r1=892886&r2=892887&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java Mon
Dec 21 17:15:41 2009
@@ -38,23 +38,16 @@
*/
public class JdbcLeakPrevention {
-/*
- * This driver is visible to all classloaders but is loaded by the system
- * class loader so there is no need to unload it.
- */
-private static final String JDBC_ODBC_BRIDGE_DRIVER =
-"sun.jdbc.odbc.JdbcOdbcDriver";
-
public List clearJdbcDriverRegistrations() throws SQLException {
List driverNames = new ArrayList();
-
-// Unregister any JDBC drivers loaded by the class loader that loaded
-// this class - ie the webapp class loader
+
+// This will list all drivers visible to this class loader
Enumeration drivers = DriverManager.getDrivers();
while (drivers.hasMoreElements()) {
Driver driver = drivers.nextElement();
-if (JDBC_ODBC_BRIDGE_DRIVER.equals(
-driver.getClass().getCanonicalName())) {
+// Only unload the drivers this web app loaded
+if (driver.getClass().getClassLoader() !=
+this.getClass().getClassLoader()) {
continue;
}
driverNames.add(driver.getClass().getCanonicalName());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48214] JDBC DriverManager: no suitable driver found after context reload
https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 --- Comment #3 from Mark Thomas 2009-12-21 09:16:22 GMT --- There was a bug here. It has been fixed in trunk and proposed for 6.0.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892888 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Mon Dec 21 17:18:31 2009 New Revision: 892888 URL: http://svn.apache.org/viewvc?rev=892888&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=892888&r1=892887&r2=892888&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 17:18:31 2009 @@ -322,3 +322,9 @@ rjung: I added the second commit after Mark proposed and votes. It is a comment typo change only. Will need more time to vote on the whole proposal though. + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 + The JDBC driver de-registration is too zealous + http://svn.apache.org/viewvc?rev=892887&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892888 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 21/12/2009 17:18, ma...@apache.org wrote: > +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 > + The JDBC driver de-registration is too zealous > + http://svn.apache.org/viewvc?rev=892887&view=rev > + +1: markt > + -1: This is the only remaining fix I think we have to have in 6.0.21. There are others it would be nice to have, but I don't view then as essential. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892896 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Dec 21 17:41:38 2009 New Revision: 892896 URL: http://svn.apache.org/viewvc?rev=892896&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=892896&r1=892895&r2=892896&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 17:41:38 2009 @@ -328,3 +328,12 @@ http://svn.apache.org/viewvc?rev=892887&view=rev +1: markt -1: + +* Update to Tomcat-Native 1.1.18 + http://people.apache.org/~kkolinko/patches/2009-12-21_tomcat-native_1.1.18.patch + Note: as of now, the windows binaries at + http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries/ + are not yet available, so this patch is untested and it has not been + applied to trunk yet. + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r892905 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Mon Dec 21 17:52:10 2009 New Revision: 892905 URL: http://svn.apache.org/viewvc?rev=892905&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=892905&r1=892904&r2=892905&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 17:52:10 2009 @@ -326,7 +326,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 The JDBC driver de-registration is too zealous http://svn.apache.org/viewvc?rev=892887&view=rev - +1: markt + +1: markt, rjung -1: * Update to Tomcat-Native 1.1.18 @@ -335,5 +335,7 @@ http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries/ are not yet available, so this patch is untested and it has not been applied to trunk yet. - +1: kkolinko + +1: kkolinko, rjung -1: + rjung: it seems binaries are there now. You only want to update the build file, + not the minimum tcnative version required in the source, right? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892905 - /tomcat/tc6.0.x/trunk/STATUS.txt
2009/12/21 : > Author: rjung > Date: Mon Dec 21 17:52:10 2009 > New Revision: 892905 > > URL: http://svn.apache.org/viewvc?rev=892905&view=rev > Log: > Vote. > > Modified: > tomcat/tc6.0.x/trunk/STATUS.txt > > @@ -335,5 +335,7 @@ > > http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries/ > are not yet available, so this patch is untested and it has not been > applied to trunk yet. > - +1: kkolinko > + +1: kkolinko, rjung > -1: > + rjung: it seems binaries are there now. No, http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries/ is still empty. 1.1.17 ones are present, though. > You only want to update the build file, > + not the minimum tcnative version required in the source, right? I do not remember, whether we should. As of now, AprLifecycleListener of 6.0.x requires 1.1.17. 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: r892906 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Dec 21 18:05:25 2009 New Revision: 892906 URL: http://svn.apache.org/viewvc?rev=892906&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=892906&r1=892905&r2=892906&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Dec 21 18:05:25 2009 @@ -326,8 +326,10 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48214 The JDBC driver de-registration is too zealous http://svn.apache.org/viewvc?rev=892887&view=rev - +1: markt, rjung + +1: markt, rjung, kkolinko -1: + kkolinko: this.getClass().getClassLoader()) call could be moved out of +the loop, because it incurs SecurityManager.checkPermission() check. * Update to Tomcat-Native 1.1.18 http://people.apache.org/~kkolinko/patches/2009-12-21_tomcat-native_1.1.18.patch - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48223] IIS Logs HTTP status code 200 instead of error code
https://issues.apache.org/bugzilla/show_bug.cgi?id=48223 --- Comment #1 from Rainer Jung 2009-12-21 10:18:33 UTC --- Created an attachment (id=24748) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24748) Set status code retrieved from backend Still need to test, whether this triggers some additional error response form IIS. Guess no. -- 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 48223] IIS Logs HTTP status code 200 instead of error code
https://issues.apache.org/bugzilla/show_bug.cgi?id=48223 Rainer Jung changed: What|Removed |Added Keywords||PatchAvailable -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r892905 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 21.12.2009 19:01, Konstantin Kolinko wrote: 2009/12/21: Author: rjung Date: Mon Dec 21 17:52:10 2009 New Revision: 892905 URL: http://svn.apache.org/viewvc?rev=892905&view=rev Log: Vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt @@ -335,5 +335,7 @@ http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries/ are not yet available, so this patch is untested and it has not been applied to trunk yet. - +1: kkolinko + +1: kkolinko, rjung -1: + rjung: it seems binaries are there now. No, http://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.1.18/binaries/ is still empty. 1.1.17 ones are present, though. Sorry, forgot that it is pointing to archives (and needs to). The 18 files are already in dist: http://www.apache.org/dist/tomcat//tomcat-connectors/native/1.1.18/binaries/ but not yet at archives. I forgot how often the archives sync runs, but likely around once a day. I think the sync from people.a.o to www/dist runs more often than archive. You only want to update the build file, + not the minimum tcnative version required in the source, right? I do not remember, whether we should. As of now, AprLifecycleListener of 6.0.x requires 1.1.17. Yes, I think we can stick to 17. Version 1.1.18 AFAIK contains the native fix against client initiated SSL renegotiation. Everyone is free to update tcnative even if not enforced by the listener, but maybe the release is a bit to recent to enforce it. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
