svn commit: r890719 - in /tomcat/native/branches/1.1.x/native/src: sslcontext.c sslinfo.c sslutils.c
Author: mturk
Date: Tue Dec 15 09:44:38 2009
New Revision: 890719
URL: http://svn.apache.org/viewvc?rev=890719view=rev
Log:
Axe using STACK directly. The API uses STACK_OF...
Modified:
tomcat/native/branches/1.1.x/native/src/sslcontext.c
tomcat/native/branches/1.1.x/native/src/sslinfo.c
tomcat/native/branches/1.1.x/native/src/sslutils.c
Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=890719r1=890718r2=890719view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Tue Dec 15 09:44:38
2009
@@ -367,10 +367,10 @@
if (ca_certs == NULL) {
SSL_load_client_CA_file(J2S(file));
if (ca_certs != NULL)
-SSL_CTX_set_client_CA_list(c-ctx, (STACK *)ca_certs);
+SSL_CTX_set_client_CA_list(c-ctx, ca_certs);
}
else {
-if (!SSL_add_file_cert_subjects_to_stack((STACK *)ca_certs,
J2S(file)))
+if (!SSL_add_file_cert_subjects_to_stack(ca_certs, J2S(file)))
ca_certs = NULL;
}
if (ca_certs == NULL c-verify_mode == SSL_CVERIFY_REQUIRE) {
Modified: tomcat/native/branches/1.1.x/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslinfo.c?rev=890719r1=890718r2=890719view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslinfo.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslinfo.c Tue Dec 15 09:44:38 2009
@@ -318,7 +318,7 @@
break;
case SSL_INFO_CIPHER_DESCRIPTION:
{
-SSL_CIPHER *cipher = SSL_get_current_cipher(s-ssl);
+const SSL_CIPHER *cipher = SSL_get_current_cipher(s-ssl);
if (cipher) {
char buf[256];
char *desc = SSL_CIPHER_description(cipher, buf, 256);
@@ -513,7 +513,7 @@
{
int usekeysize = 0;
int algkeysize = 0;
-SSL_CIPHER *cipher = SSL_get_current_cipher(s-ssl);
+const SSL_CIPHER *cipher = SSL_get_current_cipher(s-ssl);
if (cipher) {
usekeysize = SSL_CIPHER_get_bits(cipher, algkeysize);
if (what == SSL_INFO_CIPHER_USEKEYSIZE)
Modified: tomcat/native/branches/1.1.x/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslutils.c?rev=890719r1=890718r2=890719view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslutils.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslutils.c Tue Dec 15 09:44:38 2009
@@ -424,7 +424,7 @@
X509 *x509;
unsigned long err;
int n;
-STACK *extra_certs;
+STACK_OF(X509) *extra_certs;
if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
return -1;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r890720 - in /tomcat/native/trunk/native/src: sslcontext.c sslinfo.c sslutils.c
Author: mturk
Date: Tue Dec 15 09:46:09 2009
New Revision: 890720
URL: http://svn.apache.org/viewvc?rev=890720view=rev
Log:
Axe using STACK directly. The API uses STACK_OF...
Modified:
tomcat/native/trunk/native/src/sslcontext.c
tomcat/native/trunk/native/src/sslinfo.c
tomcat/native/trunk/native/src/sslutils.c
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=890720r1=890719r2=890720view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Tue Dec 15 09:46:09 2009
@@ -367,10 +367,10 @@
if (ca_certs == NULL) {
SSL_load_client_CA_file(J2S(file));
if (ca_certs != NULL)
-SSL_CTX_set_client_CA_list(c-ctx, (STACK *)ca_certs);
+SSL_CTX_set_client_CA_list(c-ctx, ca_certs);
}
else {
-if (!SSL_add_file_cert_subjects_to_stack((STACK *)ca_certs,
J2S(file)))
+if (!SSL_add_file_cert_subjects_to_stack(ca_certs, J2S(file)))
ca_certs = NULL;
}
if (ca_certs == NULL c-verify_mode == SSL_CVERIFY_REQUIRE) {
Modified: tomcat/native/trunk/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=890720r1=890719r2=890720view=diff
==
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Tue Dec 15 09:46:09 2009
@@ -318,7 +318,7 @@
break;
case SSL_INFO_CIPHER_DESCRIPTION:
{
-SSL_CIPHER *cipher = SSL_get_current_cipher(s-ssl);
+const SSL_CIPHER *cipher = SSL_get_current_cipher(s-ssl);
if (cipher) {
char buf[256];
char *desc = SSL_CIPHER_description(cipher, buf, 256);
@@ -513,7 +513,7 @@
{
int usekeysize = 0;
int algkeysize = 0;
-SSL_CIPHER *cipher = SSL_get_current_cipher(s-ssl);
+const SSL_CIPHER *cipher = SSL_get_current_cipher(s-ssl);
if (cipher) {
usekeysize = SSL_CIPHER_get_bits(cipher, algkeysize);
if (what == SSL_INFO_CIPHER_USEKEYSIZE)
Modified: tomcat/native/trunk/native/src/sslutils.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=890720r1=890719r2=890720view=diff
==
--- tomcat/native/trunk/native/src/sslutils.c (original)
+++ tomcat/native/trunk/native/src/sslutils.c Tue Dec 15 09:46:09 2009
@@ -424,7 +424,7 @@
X509 *x509;
unsigned long err;
int n;
-STACK *extra_certs;
+STACK_OF(X509) *extra_certs;
if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
return -1;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48358] JSP-unloading reloaded
https://issues.apache.org/bugzilla/show_bug.cgi?id=48358 Isabel Drost isa...@apache.org changed: What|Removed |Added Attachment #24684|0 |1 is obsolete|| --- Comment #4 from Isabel Drost isa...@apache.org 2009-12-15 01:53:57 UTC --- Created an attachment (id=24707) -- (https://issues.apache.org/bugzilla/attachment.cgi?id=24707) Patch including tests that adds support for selectively unloading jsps. The patch includes changes to the way of identifying the jsp(s) to destroy: If unloading is activated, the JspRuntimeContext tracks the relative age - in terms of last execution time - of each jsp. Age is tracked in a queue that supports additions, updates and removal of its nodes in constant time. If unloading is activated this gets rid of the costly loop for identifying candidate jsps. It should incur only slight overhead at jsp execution time. -- 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 48358] JSP-unloading reloaded
https://issues.apache.org/bugzilla/show_bug.cgi?id=48358 --- Comment #5 from Isabel Drost isa...@apache.org 2009-12-15 01:57:40 UTC --- Have you tested your JSP unloading with heavy load? We ran initial smoke-tests against artificial setups as well as load tests against a real-world web application with user requests extracted from log files on our test systems. So far everything looks good. Further tests are currently being run. Will report the results as soon as they are available. -- 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 48358] JSP-unloading reloaded
https://issues.apache.org/bugzilla/show_bug.cgi?id=48358 --- Comment #6 from Isabel Drost isa...@apache.org 2009-12-15 02:03:43 UTC --- As a point of clarification, if a JSP is changed then the old implementation should be unloaded before the new implementation is loaded. Therefore, lots of changes to a small number of pages shouldn't cause an issue. You are right: 1) My explanation was wrong in this respect, 2) re-loading existing jsps this doesn't cause an issue. -- 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: r890738 - /tomcat/jk/trunk/native/common/jk_util.c
Author: mturk
Date: Tue Dec 15 10:14:28 2009
New Revision: 890738
URL: http://svn.apache.org/viewvc?rev=890738view=rev
Log:
Use better thread id logic. Use 4/8 byte alignment
Modified:
tomcat/jk/trunk/native/common/jk_util.c
Modified: tomcat/jk/trunk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=890738r1=890737r2=890738view=diff
==
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Tue Dec 15 10:14:28 2009
@@ -2125,13 +2125,16 @@
pthread_getunique_np((u.tid), tid);
return ((jk_uint32_t)(tid.intId.lo 0x));
#else
-switch(sizeof(pthread_t)) {
-case sizeof(jk_uint32_t):
-return *(jk_uint32_t *)u.tid;
-case sizeof(jk_uint64_t):
-return (*(jk_uint64_t *)u.tid) 0x;
-default:
-return 0;
+switch (sizeof(pthread_t)) {
+case sizeof(jk_uint32_t):
+return ((jk_uint32_t)u.tid 2);
+break;
+case sizeof(jk_uint64_t):
+return (jk_uint32_t)jk_uint64_t)u.tid) 3) 0x);
+break;
+default:
+return 0;
+break;
}
#endif /* AS400 */
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r890739 - /tomcat/jk/trunk/native/common/jk_uri_worker_map.c
Author: mturk Date: Tue Dec 15 10:15:18 2009 New Revision: 890739 URL: http://svn.apache.org/viewvc?rev=890739view=rev Log: Fix compile time warining about uninitialized variable Modified: tomcat/jk/trunk/native/common/jk_uri_worker_map.c Modified: tomcat/jk/trunk/native/common/jk_uri_worker_map.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_uri_worker_map.c?rev=890739r1=890738r2=890739view=diff == --- tomcat/jk/trunk/native/common/jk_uri_worker_map.c (original) +++ tomcat/jk/trunk/native/common/jk_uri_worker_map.c Tue Dec 15 10:15:18 2009 @@ -632,7 +632,7 @@ char *w; char *param; #ifdef _MT_CODE_PTHREAD -char *lasts; +char *lasts = NULL; #endif w = jk_pool_strdup(p, worker); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r890740 - /tomcat/jk/trunk/native/common/jk_ajp_common.c
Author: mturk
Date: Tue Dec 15 10:16:49 2009
New Revision: 890740
URL: http://svn.apache.org/viewvc?rev=890740view=rev
Log:
Drop exces packet during cping/cpong. We should probably do that for
SEND_HEADERS as well
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
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=890740r1=890739r2=890740view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Tue Dec 15 10:16:49 2009
@@ -828,6 +828,7 @@
*/
static int ajp_handle_cping_cpong(ajp_endpoint_t * ae, int timeout,
jk_logger_t *l)
{
+int i;
int cmd;
jk_msg_buf_t *msg;
@@ -858,38 +859,65 @@
return JK_FALSE;
}
-/* wait for Pong reply for timeout milliseconds
- */
-if (jk_is_input_event(ae-sd, timeout, l) == JK_FALSE) {
-ae-last_errno = errno;
-jk_log(l, JK_LOG_INFO, timeout in reply cpong);
-/* We can't trust this connection any more. */
-jk_shutdown_socket(ae-sd, l);
-ae-sd = JK_INVALID_SOCKET;
-JK_TRACE_EXIT(l);
-return JK_FALSE;
-}
+for (i = 0; i 2; i++) {
+/* wait for Pong reply for timeout milliseconds
+ */
+if (jk_is_input_event(ae-sd, timeout, l) == JK_FALSE) {
+ae-last_errno = errno;
+jk_log(l, JK_LOG_INFO, timeout in reply cpong);
+/* We can't trust this connection any more. */
+jk_shutdown_socket(ae-sd, l);
+ae-sd = JK_INVALID_SOCKET;
+ae-last_op = JK_AJP13_END_RESPONSE;
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
-/* Read and check for Pong reply
- */
-if (ajp_connection_tcp_get_message(ae, msg, l) != JK_TRUE) {
-jk_log(l, JK_LOG_INFO,
- awaited reply cpong, not received);
-JK_TRACE_EXIT(l);
-return JK_FALSE;
-}
+/* Read and check for Pong reply
+ */
+if (ajp_connection_tcp_get_message(ae, msg, l) != JK_TRUE) {
+jk_log(l, JK_LOG_INFO,
+ awaited reply cpong, not received);
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
-if ((cmd = jk_b_get_byte(msg)) != AJP13_CPONG_REPLY) {
-jk_log(l, JK_LOG_WARNING,
- awaited reply cpong, received %d instead,
- cmd);
-/* We can't trust this connection any more. */
-jk_shutdown_socket(ae-sd, l);
-ae-sd = JK_INVALID_SOCKET;
-JK_TRACE_EXIT(l);
-return JK_FALSE;
-}
+if ((cmd = jk_b_get_byte(msg)) != AJP13_CPONG_REPLY) {
+/* If the respose was not CPONG it means that
+ * the previous response was not consumed by the
+ * client but the AJP messages was already in
+ * the network buffer.
+ * silently drop this single extra packet instead
+ * recycling the connection
+ */
+if (i || ae-last_op == JK_AJP13_END_RESPONSE ||
+ cmd JK_AJP13_SEND_BODY_CHUNK ||
+ cmd AJP13_CPONG_REPLY) {
+jk_log(l, JK_LOG_WARNING,
+ awaited reply cpong, received %d instead.
+ Closing connection,
+ cmd);
+/* We can't trust this connection any more. */
+jk_shutdown_socket(ae-sd, l);
+ae-sd = JK_INVALID_SOCKET;
+ae-last_op = JK_AJP13_END_RESPONSE;
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+else {
+jk_log(l, JK_LOG_INFO,
+ awaited reply cpong, received %d instead.
+ Retrying next packet,
+ cmd);
+}
+}
+else {
+ae-last_op = AJP13_CPONG_REPLY;
+/* We have received Pong reply */
+break;
+}
+}
JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -948,6 +976,7 @@
/* Close the socket if unable to logon */
jk_shutdown_socket(ae-sd, l);
ae-sd = JK_INVALID_SOCKET;
+ae-last_op = JK_AJP13_END_RESPONSE;
}
}
/* XXX: Should we send a cping also after logon to validate the
connection? */
@@ -1083,6 +1112,7 @@
/* because we might have send already parts of the request. */
jk_shutdown_socket(ae-sd, l);
ae-sd = JK_INVALID_SOCKET;
+ae-last_op = JK_AJP13_END_RESPONSE;
JK_TRACE_EXIT(l);
return JK_FATAL_ERROR;
}
@@ -1102,6 +1132,7 @@
sendfull for socket %d returned %d (errno=%d),
ae-sd, rc, ae-last_errno);
ae-sd = JK_INVALID_SOCKET;
+ae-last_op = JK_AJP13_END_RESPONSE;
DO NOT REPLY [Bug 48391] New: Logfile goes missing when running on IIS6 in application pool (not in IIS5 isolation mode)
https://issues.apache.org/bugzilla/show_bug.cgi?id=48391 Summary: Logfile goes missing when running on IIS6 in application pool (not in IIS5 isolation mode) Product: Tomcat Connectors Version: 1.2.28 Platform: PC OS/Version: Windows Server 2003 Status: NEW Severity: normal Priority: P2 Component: mod_jk AssignedTo: dev@tomcat.apache.org ReportedBy: p...@mediamens.nl I'm setting up Tomcat 5.5.28 under IIS6 on a w2k3 server. When I configure IIS6 to run WWW service in IIS5 isolation mode everything is working fine. However, when I uncheck run WWW service in IIS5 isolation mode, then still everything works fine, if only I could find the redirectors logfile :-/ So, the redirector is still working, the site still works, but the redirector logfile is no longer created (at least not there where I would expect it). -- 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: r890738 - /tomcat/jk/trunk/native/common/jk_util.c
Hi Mladen,
On 15.12.2009 11:14, mt...@apache.org wrote:
Author: mturk
Date: Tue Dec 15 10:14:28 2009
New Revision: 890738
URL: http://svn.apache.org/viewvc?rev=890738view=rev
Log:
Use better thread id logic. Use 4/8 byte alignment
Modified:
tomcat/jk/trunk/native/common/jk_util.c
Modified: tomcat/jk/trunk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=890738r1=890737r2=890738view=diff
==
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Tue Dec 15 10:14:28 2009
@@ -2125,13 +2125,16 @@
pthread_getunique_np((u.tid),tid);
return ((jk_uint32_t)(tid.intId.lo 0x));
#else
-switch(sizeof(pthread_t)) {
-case sizeof(jk_uint32_t):
-return *(jk_uint32_t *)u.tid;
-case sizeof(jk_uint64_t):
-return (*(jk_uint64_t *)u.tid) 0x;
-default:
-return 0;
+switch (sizeof(pthread_t)) {
+case sizeof(jk_uint32_t):
+return ((jk_uint32_t)u.tid 2);
+break;
+case sizeof(jk_uint64_t):
+return (jk_uint32_t)jk_uint64_t)u.tid) 3) 0x);
+break;
+default:
+return 0;
+break;
}
#endif /* AS400 */
}
Why is that better? I'm concerned, that it breaks thread id's as logged
by other components. For instance on Solaris I think the thread id
logged by mod_jk is the same as by httpd when using %{tid}P in the
access log. On Linux there are two different thread ids, one in the type
of the pid, and another one which usually produces large numbers.
What does the above change result in w.r.t. aligning our thread id with
the one in Apache?
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r890738 - /tomcat/jk/trunk/native/common/jk_util.c
On 12/15/2009 02:12 PM, Rainer Jung wrote:
Why is that better?
Uses significant bits out of pthread pointer.
I'm concerned, that it breaks thread id's as logged
by other components. For instance on Solaris I think the thread id
logged by mod_jk is the same as by httpd when using %{tid}P in the
access log
They are logged as 64 bit numbers on 64 bit builds, while our is
casted to the lower 32 bits.
What does the above change result in w.r.t. aligning our thread id with
the one in Apache?
The solution would be to use something like on httpd:
apr_psprintf(r-pool, %pT, tid)
which takes care if the pointer is 32/64 and prints it correctly.
Without that stripping upper 32 bits and logging that number makes no
sense whatsoever.
Regards
--
^TM
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r890856 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jim Date: Tue Dec 15 16:13:06 2009 New Revision: 890856 URL: http://svn.apache.org/viewvc?rev=890856view=rev Log: Some votes... those with =3 I will commit today or so 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=890856r1=890855r2=890856view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 15 16:13:06 2009 @@ -98,7 +98,7 @@ * Make JULI FileHandler thread safe http://svn.apache.org/viewvc?rev=881396view=rev - +1: fhanik, markt, jfclere + +1: fhanik, markt, jfclere, jim -1: * Allow to disable buffering in JULI FileHandler @@ -106,7 +106,7 @@ records, like it was before rev.814876. It depends on the above FileHandler patches. http://svn.apache.org/viewvc?rev=816252view=rev - +1: kkolinko, markt, jfclere + +1: kkolinko, markt, jfclere, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47893 @@ -277,7 +277,7 @@ * Additional fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47495 Exit immediately if Catalina.load() failed to create a server instance. http://svn.apache.org/viewvc?rev=836405view=rev - +1: kkolinko, markt, jfclere + +1: kkolinko, markt, jfclere, jim -1: * Further improvements to Windows installer password handling @@ -293,7 +293,7 @@ * Improvements to memory leak prevention http://people.apache.org/~markt/patches/2009-11-10-leak-prevention.patch - +1: markt, kkolinko + +1: markt, kkolinko, jim -1: * Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48097 @@ -304,22 +304,22 @@ 2) Add preloading of WebappClassLoader$PrivilegedFindResourceByName, to fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097#c13 http://people.apache.org/~kkolinko/patches/2009-11-12_PrivilegedFindResource_tc6.patch - +1: kkolinko, markt + +1: kkolinko, markt, jim -1: * Single quote should be not be treated as a separator http://svn.apache.org/viewvc?rev=830999view=rev - +1: markt, kkolinko, jfclere + +1: markt, kkolinko, jfclere, jim -1: * Update to commons-pool 1.5.4 http://svn.apache.org/viewvc?rev=881412view=rev - +1: markt + +1: markt, jim -1: * Provide new option to allow = in cookie values http://people.apache.org/~markt/patches/2009-11-17-cookie-allow-equals.patch - +1: markt + +1: markt, jim -1: * Alternative fix for CVE-2009-3555 SSL MITN @@ -327,26 +327,26 @@ technically possible an attack may suceed before the socket is closed The new patch only logs failed server initiated negotiations http://people.apache.org/~markt/patches/2009-11-20-cve2009-3555-v2.patch - +1: markt + +1: markt, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48252 Patch attached to BZ - +1: fhanik, markt + +1: fhanik, markt, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609 Implment fail-safe EOL conversion for source disributions Based on a patch provided by sebb http://svn.apache.org/viewvc?rev=883125view=rev - +1: markt + +1: markt, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47718 Correct file descriptor leak on context stop/reload Patch provided by George Sexton http://svn.apache.org/viewvc?rev=883130view=rev - +1: markt + +1: markt, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997 @@ -365,7 +365,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47554 httpOnly flag not applied to migrated session cookie https://issues.apache.org/bugzilla/show_bug.cgi?id=47554 - +1: markt + +1: markt, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47799 @@ -379,7 +379,7 @@ Fix copy and paste error and call correct function Patch provided by gingyang.xu http://svn.apache.org/viewvc?rev=883177view=rev - +1: markt + +1: markt, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48113 @@ -407,13 +407,13 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48300 Only the APR lifecycle listener should try and initialise APR http://people.apache.org/~markt/patches/2009-11-27-bug48300-tc6.patch - +1: markt, jfclere + +1: markt, jfclere, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47342 Fix NPE on replicated context start Patch provided by Keiichi Fujino - +1: markt, pero, jfclere + +1: markt, pero, jfclere, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47453 @@ -427,12 +427,12 @@ Don't try and replicate attributes we know to be non-serializable Patch by Tim Funk http://svn.apache.org/viewvc?rev=886019view=rev - +1: markt, pero + +1: markt, pero, jim -1: * Prevent lost log messages on shutdown http://svn.apache.org/viewvc?rev=888072view=rev
Re: svn commit: r890856 - /tomcat/tc6.0.x/trunk/STATUS.txt
On 12/15/2009 05:13 PM, j...@apache.org wrote: Some votes... those with=3 I will commit today or so Shouldn't that be a responsibility of the proposer? Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r890856 - /tomcat/tc6.0.x/trunk/STATUS.txt
Typically the proposer will commit with +3 - but its not mandatory. As long as there are +3 - then it really doesn't matter who does the commit since there was a +3 consensus on the change. -Tim On 12/15/2009 11:39 AM, Mladen Turk wrote: On 12/15/2009 05:13 PM, j...@apache.org wrote: Some votes... those with=3 I will commit today or so Shouldn't that be a responsibility of the proposer? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48069] Log Files not getting updated while using isapi_redirect.properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=48069 --- Comment #3 from David Esposito d...@9summer.com 2009-12-15 09:33:53 UTC --- I had this exact same issue. When I had the isapi_redirect.properties in the directory with the DLL, the log file was never created (very frustrating). When I created the registry key and all of the string values for the configuration properties (exactly the same as the .properties file), the log file was created. I verified using Process Monitor (sysinternals) that the isapi_redirect.properties file was getting opened and read by the DLL so it wasn't a permissions issue on the properties file .. and since the log file was created in the location specified by both the properties and registry keys, that rules out a filesystem permission issue in the directory for the log file. I also tried both the 32-bit and amd64 builds of 1.2.28 (both the chunking and non-chunking builds) and all exhibited the same problem. -- 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 48069] Log Files not getting updated while using isapi_redirect.properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=48069 David Esposito d...@9summer.com changed: What|Removed |Added CC||d...@9summer.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r890937 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java java/org/apache/catalina/core/LocalStrings.properties webapps/docs/changel
Author: markt
Date: Tue Dec 15 18:48:54 2009
New Revision: 890937
URL: http://svn.apache.org/viewvc?rev=890937view=rev
Log:
Improve memory leak protection
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/java/org/apache/catalina/core/LocalStrings.properties
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=890937r1=890936r2=890937view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 15 18:48:54 2009
@@ -291,11 +291,6 @@
-1:
+0: markt Combined patch needs to have 834047 removed and 881765 added
-* Improvements to memory leak prevention
- http://people.apache.org/~markt/patches/2009-11-10-leak-prevention.patch
- +1: markt, kkolinko, jim
- -1:
-
* Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
1) Code cleanup: Remove use of WebappClassLoader$PrivilegedFindResource,
because all findResourceInternal(String,String) calls are now already
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=890937r1=890936r2=890937view=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
Tue Dec 15 18:48:54 2009
@@ -17,21 +17,64 @@
package org.apache.catalina.core;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
import javax.imageio.ImageIO;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
/**
- * Provide a workaround for known places where the Java Runtime environment
uses
+ * Provide a workaround for known places where the Java Runtime environment can
+ * cause a memory leak or lock files.
+ * p
+ * Memory leaks occur when JRE code uses
* the context class loader to load a singleton as this will cause a memory
leak
* if a web application class loader happens to be the context class loader at
* the time. The work-around is to initialise these singletons when Tomcat's
* common class loader is the context class loader.
+ * p
+ * Locked files usually occur when a resource inside a JAR is accessed without
+ * first disabling Jar URL connection caching. The workaround is to disable
this
+ * caching by default.
*/
public class JreMemoryLeakPreventionListener implements LifecycleListener {
+protected static final Log log =
+LogFactory.getLog(JreMemoryLeakPreventionListener.class);
+protected static final StringManager sm =
+StringManager.getManager(Constants.Package);
+
+/**
+ * Protect against the memory leak caused when the first call to
+ * codesun.awt.AppContext.getAppContext()/code is triggered by a web
+ * application. Defaults to codetrue/code.
+ */
+protected boolean appContextProtection = true;
+public boolean isAppContextProtection() { return appContextProtection; }
+public void setAppContextProtection(boolean appContextProtection) {
+this.appContextProtection = appContextProtection;
+}
+
+/**
+ * Protect against resources being read for JAR files and, as a
side-effect,
+ * the JAR file becoming locked. Note this disables caching for all
+ * {...@link URLConnection}s, regardless of type. Defaults to
+ * codetrue/code.
+ */
+protected boolean urlCacheProtection = true;
+public boolean isUrlCacheProtection() { return urlCacheProtection; }
+public void setUrlCacheProtection(boolean urlCacheProtection) {
+this.urlCacheProtection = urlCacheProtection;
+}
+
public void lifecycleEvent(LifecycleEvent event) {
// Initialise these classes when Tomcat starts
if (Lifecycle.INIT_EVENT.equals(event.getType())) {
@@ -41,7 +84,6 @@
*
* Those libraries / components known to trigger memory leaks due
to
* eventual calls to getAppContext() are:
- *
* - Google Web Toolkit via its use of javax.imageio
* - Tomcat via its use of java.beans.Introspector.flushCaches() in
* 1.6.0_15 onwards
@@ -51,8 +93,37 @@
// Trigger a call to
svn commit: r890940 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/http/Cookies.java test/org/apache/tomcat/util/http/TestCookies.java webapps/docs/changelog.xml
Author: markt Date: Tue Dec 15 18:53:06 2009 New Revision: 890940 URL: http://svn.apache.org/viewvc?rev=890940view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48322 Single quote is not a separator 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/http/Cookies.java tomcat/tc6.0.x/trunk/test/org/apache/tomcat/util/http/TestCookies.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 15 18:53:06 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,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,770876,77 2872,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,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831106,831774,831785,831828,831850,831860,832218,833121,833545,834047,835036,835336,889363,890417 +/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,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,770876,77 2872,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,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,889363,890417 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=890940r1=890939r2=890940view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 15 18:53:06 2009 @@ -302,11 +302,6 @@ +1: kkolinko, markt, jim -1: -* Single quote should be not be treated as a separator - http://svn.apache.org/viewvc?rev=830999view=rev - +1: markt, kkolinko, jfclere, jim - -1: - * Update to commons-pool 1.5.4 http://svn.apache.org/viewvc?rev=881412view=rev +1: markt, jim Modified:
DO NOT REPLY [Bug 48322] Reading a cookie with an apostrophe in the value is truncated in Tomcat 6.0.20 and 6.0.18
https://issues.apache.org/bugzilla/show_bug.cgi?id=48322 Mark Thomas ma...@apache.org changed: What|Removed |Added Component|Catalina|Catalina Version|6.0.20 |5.5.28 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #2 from Mark Thomas ma...@apache.org 2009-12-15 10:53:12 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: r890942 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/connector/Connector.java java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: markt
Date: Tue Dec 15 19:00:23 2009
New Revision: 890942
URL: http://svn.apache.org/viewvc?rev=890942view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48300
Only the APR lifecycle listener should try and initialise APR
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=890942r1=890941r2=890942view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 15 19:00:23 2009
@@ -394,12 +394,6 @@
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48300
- Only the APR lifecycle listener should try and initialise APR
- http://people.apache.org/~markt/patches/2009-11-27-bug48300-tc6.patch
- +1: markt, jfclere, jim
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47342
Fix NPE on replicated context start
Patch provided by Keiichi Fujino
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=890942r1=890941r2=890942view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Tue
Dec 15 19:00:23 2009
@@ -18,7 +18,6 @@
package org.apache.catalina.connector;
-import java.lang.reflect.Method;
import java.net.URLEncoder;
import java.util.HashMap;
@@ -32,6 +31,7 @@
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Service;
+import org.apache.catalina.core.AprLifecycleListener;
import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
@@ -605,54 +605,6 @@
}
-// -- APR Version Constants
-
-private static final int TCN_REQUIRED_MAJOR = 1;
-private static final int TCN_REQUIRED_MINOR = 1;
-private static final int TCN_REQUIRED_PATCH = 17;
-private static boolean aprInitialized = false;
-
-// APR init support
-private static synchronized void initializeAPR()
-{
-if (aprInitialized) {
-return;
-}
-int major = 0;
-int minor = 0;
-int patch = 0;
-try {
-String methodName = initialize;
-Class paramTypes[] = new Class[1];
-paramTypes[0] = String.class;
-Object paramValues[] = new Object[1];
-paramValues[0] = null;
-Class clazz = Class.forName(org.apache.tomcat.jni.Library);
-Method method = clazz.getMethod(methodName, paramTypes);
-method.invoke(null, paramValues);
-major = clazz.getField(TCN_MAJOR_VERSION).getInt(null);
-minor = clazz.getField(TCN_MINOR_VERSION).getInt(null);
-patch = clazz.getField(TCN_PATCH_VERSION).getInt(null);
-} catch (Throwable t) {
-return;
-}
-if ((major != TCN_REQUIRED_MAJOR) ||
-(minor != TCN_REQUIRED_MINOR) ||
-(patch TCN_REQUIRED_PATCH)) {
-try {
-// Terminate the APR in case the version
-// is below required.
-String methodName = terminate;
-Method method = Class.forName(org.apache.tomcat.jni.Library)
-.getMethod(methodName, (Class [])null);
-method.invoke(null, (Object []) null);
-} catch (Throwable t) {
-// Ignore
-}
-return;
-}
-aprInitialized = true;
-}
/**
* Set the Coyote protocol which will be used by the connector.
@@ -661,10 +613,7 @@
*/
public void setProtocol(String protocol) {
-// Test APR support
-initializeAPR();
-
-if (aprInitialized) {
+if (AprLifecycleListener.isAprAvailable()) {
if (HTTP/1.1.equals(protocol)) {
setProtocolHandlerClassName
(org.apache.coyote.http11.Http11AprProtocol);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=890942r1=890941r2=890942view=diff
==
---
svn commit: r890943 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Dec 15 19:01:20 2009 New Revision: 890943 URL: http://svn.apache.org/viewvc?rev=890943view=rev Log: Correct bug number Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=890943r1=890942r2=890943view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Dec 15 19:01:20 2009 @@ -344,7 +344,7 @@ the default Blocking IO Java connector. /fix fix -bug48300/bug: Only the APR lifecycle listener should try and +bug48311/bug: Only the APR lifecycle listener should try and initialise APR. (markt) /fix /changelog - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48311] AprLifecycleListener: Bogus behaviour with Http11AprProtocol and java.library.path
https://issues.apache.org/bugzilla/show_bug.cgi?id=48311 --- Comment #8 from Mark Thomas ma...@apache.org 2009-12-15 11:01:37 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: r890944 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ha/context/ReplicatedContext.java webapps/docs/changelog.xml
Author: markt Date: Tue Dec 15 19:05:23 2009 New Revision: 890944 URL: http://svn.apache.org/viewvc?rev=890944view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47342 Fix NPE on replicated context start 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/ha/context/ReplicatedContext.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 15 19:05:23 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,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,770876,77 2872,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,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,889363,890417 +/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,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,770876,77 2872,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,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,885038,889363,890417 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=890944r1=890943r2=890944view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 15 19:05:23 2009 @@ -394,12 +394,6 @@ +1: markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47342 - Fix NPE on replicated context start - Patch provided by Keiichi Fujino - +1: markt, pero, jfclere, jim - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47453 Handle void return types This is Tim's patch Modified:
DO NOT REPLY [Bug 47342] ReplicatedContext#start throws NullPointerException.
https://issues.apache.org/bugzilla/show_bug.cgi?id=47342 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas ma...@apache.org 2009-12-15 11:05:46 GMT --- The patch has been applied to 6.0.x and will be included in 6.0.21 onwards. Again, many thanks for your work on this issue. -- 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 47502] clustering fails on serializing javax.security.auth.subject
https://issues.apache.org/bugzilla/show_bug.cgi?id=47502 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas ma...@apache.org 2009-12-15 11:09:16 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: r890946 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ha/session/DeltaSession.java webapps/docs/changelog.xml
Author: markt Date: Tue Dec 15 19:09:05 2009 New Revision: 890946 URL: http://svn.apache.org/viewvc?rev=890946view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47502 Don't try and replicate attributes we know to be non-serializable Patch by Tim Funk Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 15 19:09:05 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,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,770876,77 2872,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,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,885038,889363,890417 +/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,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,770876,77 2872,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,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,885038,886019,889363,890417 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=890946r1=890945r2=890946view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 15 19:09:05 2009 @@ -401,13 +401,6 @@ +1: markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47502 - Don't try and replicate attributes we know to be non-serializable - Patch by Tim Funk - http://svn.apache.org/viewvc?rev=886019view=rev - +1: markt, pero, jim - -1: - * Prevent lost log messages on shutdown
DO NOT REPLY [Bug 48392] New: jdbc-pool is not returning the proxied connection in resultSet and statement
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392 Summary: jdbc-pool is not returning the proxied connection in resultSet and statement Product: Tomcat 7 Version: unspecified Platform: PC OS/Version: Windows XP Status: NEW Severity: critical Priority: P2 Component: Modules: jdbc-pool AssignedTo: dev@tomcat.apache.org ReportedBy: gsfernan...@gmail.com The proxy connection returned by the jdbc-pool is not proxying the resultSet and the statement so if the client gets access to the underlying connection through: resultSet.getStatement().getConnection() He is able to close the physical connection due to both instances (resultSet and statement) were not proxied. If this happens next time a client gets a connection from the jdbc-pool it will return a proxy with a physical connection closed. -- 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 48392] jdbc-pool is not returning the proxied connection in resultSet and statement
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392 --- Comment #1 from gfernandes gsfernan...@gmail.com 2009-12-15 12:08:01 UTC --- jdbc-pool version is: 1.0.7.1 -- 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: r891065 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java
Author: fhanik Date: Tue Dec 15 23:14:23 2009 New Revision: 891065 URL: http://svn.apache.org/viewvc?rev=891065view=rev Log: bad Fido, bad Fido Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java?rev=891065r1=891064r2=891065view=diff == --- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java (original) +++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java Tue Dec 15 23:14:23 2009 @@ -26,7 +26,6 @@ import javax.management.ObjectName; import javax.sql.XADataSource; -import org.apache.jasper.compiler.AntCompiler; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47841] CombinedRealm fails to switch to other realm
https://issues.apache.org/bugzilla/show_bug.cgi?id=47841 --- Comment #3 from Mark Thomas ma...@apache.org 2009-12-15 15:31:01 GMT --- Ah, I see what is going on here. If one of the nested realms fails to start, the combined realm fails to start. That doesn't seem like a good idea. I'll fix that so the combined realm logs an error but carries on. I'll also look at making the LDAP timeout configurable. -- 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 48394] New: Support for path attribute in context.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=48394
Summary: Support for path attribute in context.xml
Product: Tomcat 6
Version: 6.0.20
Platform: PC
OS/Version: Windows NT
Status: NEW
Severity: enhancement
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: you...@gmail.com
Currently Tomcat provides basically 2 ways to set the context path of an
application.
* Derived from the name of the .war or {context}.xml file.
* Set the path attribute of the context element in the server.xml
It would be nice if it were possible to set the path attribute in the context
element of a context.xml file.
I have a requirement where my application's context path must change depending
upon the environment it is deployed into. Instead of renaming my .war for each
environment I would prefer to set the path attribute in the context.xml of the
.war to a catalina.properties property. (e.g. context
path=${contextPath}/)
Then set the value of ${contextPath} in my catalina.properties for the
different environments along with the other properties in my application that
change for each environment such as database connection information.
I could add a context entry in my server.xml but I'm hoping to keep application
specific configuration information out of my server.xml. And from my
understanding use of context element in server.xml is somewhat deprecated.
If the path attribute is empty the tomcat can derive the context Path from the
file name just like it does now by default. I just want to add support for the
path attribute if it is specified.
I'd be more than willing at taking a stab at a patch if I could get some sort
of assurance that the general concept of this issue is valid.
--
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 48394] Support for path attribute in context.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=48394 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mark Thomas ma...@apache.org 2009-12-15 16:25:45 GMT --- Such a change is likely to result in unwanted double deployment for many users as well as significantly complicating the auto (un)deployment logic. Defining contexts in server.xml is not deprecated. It is discouraged for those use cases where the context could be defined outside server.xml One possible solution would be to place your war files outside of the host's appBase and use context.xml files in CATALINA_BASE/conf/Catalina/localhost. The path will be derived from the name of the xml file but the WAR file can be named whatever you like. Another solution is to disable autoDeploy and deployOnStartup for the host and explicitly define the contexts in server.xml If you need further advice on your options in this area, please ask on the users list. -- 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
Use KeyManagerFactory.getDefaultAlgorithm() as the default value of algorithm
Hi,
While playing with Tomcat 7 with non-Sun JDK, I got an error SunX509
KeyManagerFactory not available, it seems that in AbstractEndpoint.java, it
uses SunX509 as the default value, how about using
KeyManagerFactory.getDefaultAlgorithm() as the default value to make Tomcat
more portable.
---
private String algorithm = KeyManagerFactory.getDefaultAlgorithm();
public String getAlgorithm() { return algorithm;}
public void setAlgorithm(String s ) { this.algorithm = s;}
---
Thanks !
--
Ivan
