DO NOT REPLY [Bug 44829] HEAD request with STRICT_SERVLET_COMPLIANCE set causes ServletException if servlet performs a forward
https://issues.apache.org/bugzilla/show_bug.cgi?id=44829 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-16 00:18:27 PST --- *** This bug has been marked as a duplicate of bug 44562 *** -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44562] HEAD requests cannot go through request dispatch include.
https://issues.apache.org/bugzilla/show_bug.cgi?id=44562 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added CC||[EMAIL PROTECTED] ||u --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-16 00:18:27 PST --- *** Bug 44829 has been marked as a duplicate of this bug. *** -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648575 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/ROOT/index.html webapps/docs/changelog.xml
Author: markt Date: Wed Apr 16 00:21:34 2008 New Revision: 648575 URL: http://svn.apache.org/viewvc?rev=648575&view=rev Log: Fix broken links of ROOT is renamed. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/ROOT/index.html 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=648575&r1=648574&r2=648575&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 00:21:34 2008 @@ -137,11 +137,6 @@ +1: markt, remm -1: -* Fix some links in ROOT app is renamed. Minor clean-up. - http://svn.apache.org/viewvc?rev=648017&view=rev - +1: markt, remm, pero - -1: - * Align different Realm docs http://svn.apache.org/viewvc?rev=648161&view=rev +1: markt, remm, pero Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.html?rev=648575&r1=648574&r2=648575&view=diff == --- tomcat/tc6.0.x/trunk/webapps/ROOT/index.html (original) +++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Wed Apr 16 00:21:34 2008 @@ -114,9 +114,8 @@ - Status - -Tomcat Manager + Status +Tomcat Manager @@ -130,8 +129,8 @@ Release Notes -Change Log -Tomcat Documentation +Change Log +Tomcat Documentation @@ -163,8 +162,8 @@ -Servlets Examples -JSP Examples +Servlets Examples +JSP Examples http://java.sun.com/products/jsp";>Sun's Java Server Pages Site http://java.sun.com/products/servlet";>Sun's Servlet Site @@ -182,7 +181,7 @@ As you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at: $CATALINA_HOME/webapps/ROOT/index.html - where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. + where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. NOTE: For security reasons, using the administration webapp is restricted to users with role "admin". The manager webapp @@ -203,7 +202,7 @@ - Copyright © 1999-2007 Apache Software Foundation + Copyright © 1999-2008 Apache Software Foundation All Rights Reserved 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=648575&r1=648574&r2=648575&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 16 00:21:34 2008 @@ -151,6 +151,10 @@ 44715: Document secret attribute for AJP connector. (markt) + +Fix some links in the ROOT application that are broken if ROOT is +renamed. (markt) + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648581 - in /tomcat/tc6.0.x/trunk: STATUS.txt webapps/docs/changelog.xml webapps/docs/config/realm.xml webapps/docs/realm-howto.xml
Author: markt Date: Wed Apr 16 00:29:53 2008 New Revision: 648581 URL: http://svn.apache.org/viewvc?rev=648581&view=rev Log: Make realm docs consistent. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648581&r1=648580&r2=648581&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 00:29:53 2008 @@ -136,8 +136,3 @@ http://svn.apache.org/viewvc?rev=647339&view=rev +1: markt, remm -1: - -* Align different Realm docs - http://svn.apache.org/viewvc?rev=648161&view=rev - +1: markt, remm, pero - -1: 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=648581&r1=648580&r2=648581&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 16 00:29:53 2008 @@ -155,6 +155,10 @@ Fix some links in the ROOT application that are broken if ROOT is renamed. (markt) + +Align the Realm documentation so that both the configuration and the +how-to are consistent. (markt) + Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml?rev=648581&r1=648580&r2=648581&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/realm.xml Wed Apr 16 00:29:53 2008 @@ -209,6 +209,13 @@ user passwords are assumed to be stored in clear-text. + +When the realm is nested inside a Context element, this allows the +realm to use a DataSource defined for the Context rather than a global +DataSource. If not specified, the default is false: use a +global DataSource. + + Name of the column, in the "user roles" table, which contains a role name assigned to the corresponding user. @@ -330,6 +337,15 @@ "finding" and "searching". If not specified, "always" is used. + +The digest algorithm to apply to the plaintext password offered +by the user before comparing it with the value retrieved from the +directory. Valid values are those accepted for the algorithm name +by the java.security.MessageDigest class. If not +specified the plaintext password is assumed to be retrieved. Not +required unless userPassword is specified + + A string specifying the security protocol to use. If not given the providers default is used. @@ -451,6 +467,13 @@ + +The digest algorithm used to store passwords in non-plaintext +formats. Valid values are those accepted for the algorithm name by the +java.security.MessageDigest class. If not specified, +passwords are stored in clear text. + + Absolute or relative (to $CATALINA_BASE) pathname to the XML file containing our user information. See below for details on the @@ -483,6 +506,64 @@ information on setting up container managed security using the Memory Based Realm component. +JAAS Realm (org.apache.catalina.realm.JAASRealm) + +JAASRealm is an implementation of the Tomcat 6 +Realm interface that authenticates users through the Java +Authentication & Authorization Service (JAAS) framework which is now +provided as part of the standard J2SE API. + +Using JAASRealm gives the developer the ability to combine practically +any conceivable security realm with Tomcat's CMA. + +JAASRealm is prototype for Tomcat of the JAAS-based J2EE authentication +framework for J2EE v1.4, based on the http://www.jcp.org/en/jsr/detail?id=196";>JCP Specification Request +196 to enhance container-managed security and promote 'pluggable' +authentication mechanisms whose implementations would be +container-independent. + +Based on the JAAS login module and principal +(see javax.security.auth.spi.LoginModule and +javax.security.Principal), you can develop your own security +mechanism or wrap another third-party mechanism for integration with the CMA +as implemented by Tomcat. + +The JAAS Realm implementation supports the following additional +attributes: + + + + + The name of the application as configured in your login configuration +
svn commit: r648585 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/el/lang/ELArithmetic.java java/org/apache/el/lang/ELSupport.java java/org/apache/el/parser/AstNegative.java
Author: markt
Date: Wed Apr 16 00:38:37 2008
New Revision: 648585
URL: http://svn.apache.org/viewvc?rev=648585&view=rev
Log:
Clean up type checking code. Patch provided by Konstantin Kolinko.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstNegative.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648585&r1=648584&r2=648585&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 00:38:37 2008
@@ -82,11 +82,6 @@
+1: jfclere, rjung, fhanik, remm
-1:
-* Clean up type checking code. Patch provided by Konstantin Kolinko.
- http://svn.apache.org/viewvc?rev=646571&view=rev
- +1: markt, remm, pero
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44428
Prevent NPE
http://svn.apache.org/viewvc?rev=646574&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=648585&r1=648584&r2=648585&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java Wed Apr 16
00:38:37 2008
@@ -164,8 +164,6 @@
|| obj1 instanceof Double
|| obj0 instanceof Float
|| obj1 instanceof Float
-|| (obj0 != null && (Double.TYPE == obj0.getClass() ||
Float.TYPE == obj0.getClass()))
-|| (obj1 != null && (Double.TYPE == obj1.getClass() ||
Float.TYPE == obj1.getClass()))
|| (obj0 instanceof String && ELSupport
.isStringFloat((String) obj0)) || (obj1 instanceof
String && ELSupport
.isStringFloat((String) obj1)));
@@ -359,13 +357,12 @@
return coerce(ZERO);
}
-Class objType = obj.getClass();
-if (Character.class.equals(objType) || Character.TYPE == objType) {
+if (obj instanceof Character) {
return coerce(new Short((short) ((Character) obj).charValue()));
}
throw new IllegalArgumentException(MessageFactory.get("error.convert",
-obj, objType, "Number"));
+obj, obj.getClass(), "Number"));
}
protected abstract Number coerce(final String str);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java?rev=648585&r1=648584&r2=648585&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELSupport.java Wed Apr 16
00:38:37 2008
@@ -164,7 +164,7 @@
if (obj == null || "".equals(obj)) {
return Boolean.FALSE;
}
-if (obj instanceof Boolean || obj.getClass() == Boolean.TYPE) {
+if (obj instanceof Boolean) {
return (Boolean) obj;
}
if (obj instanceof String) {
@@ -187,7 +187,7 @@
return new Character((char) ((Number) obj).shortValue());
}
Class objType = obj.getClass();
-if (obj instanceof Character || objType == Character.TYPE) {
+if (obj instanceof Character) {
return (Character) obj;
}
@@ -259,14 +259,13 @@
return coerceToNumber((Number) obj, type);
}
-Class objType = obj.getClass();
-if (Character.class.equals(objType) || Character.TYPE == objType) {
+if (obj instanceof Character) {
return coerceToNumber(new Short((short) ((Character) obj)
.charValue()), type);
}
throw new IllegalArgumentException(MessageFactory.get("error.convert",
-obj, objType, type));
+obj, obj.getClass(), type));
}
protected final static Number coerceToNumber(final String val,
@@ -402,10 +401,7 @@
return (obj0 instanceof Double
|| obj1 instanceof Double
|| obj0 instanceof Float
-|| obj1 instanceof Float
-|| (obj0 != null && (Double.TYPE == obj0.getClass() ||
Float.TYPE == obj0
-.getClass())) || (obj1 != null && (Double.TYPE == obj1
-.getClass() || Float.TYPE == obj1.getClass(;
+|| obj1 instanceof Float);
}
public final static boolean isDoubleStringOp(final Object obj0,
@@ -424,17 +420,7 @@
svn commit: r648605 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Wed Apr 16 01:00:53 2008 New Revision: 648605 URL: http://svn.apache.org/viewvc?rev=648605&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=648605&r1=648604&r2=648605&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 01:00:53 2008 @@ -57,7 +57,7 @@ * Update comments re JAR renaming in web.xml http://svn.apache.org/viewvc?rev=639771&view=rev - +1: markt, fhanik + +1: markt, fhanik, rjung -1: * Fix NIO/Sendfile problem @@ -69,7 +69,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44759 Need source to build java docs http://svn.apache.org/viewvc?rev=645169&view=rev - +1: markt,fhanik + +1: markt,fhanik,rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42662 @@ -91,15 +91,18 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44766 Handle custom subtypes of java.lang.Number http://svn.apache.org/viewvc?view=rev&revision=646106 - +1: markt, remm + +1: markt, remm, rjung -1: + rjung: Simply use: "return Number.class.isAssignableFrom(type);" + since all other conditions are special cases of this one. * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44408 Avoid bottleneck by calling synchronized method only once http://svn.apache.org/viewvc?rev=646889&view=rev - +1: markt + +1: markt, rjung +1: remm (I never tested this was a problem in the past, though, maybe I didn't test right) -1: + rjung: Please also fix indentation. * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44392 Correct handling of HTML entities in SSI processing @@ -110,15 +113,17 @@ * Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494 Fix read when maxHttpHeaderSize > 8192 http://svn.apache.org/viewvc?rev=647304&view=rev (rjung) - +1: markt, remm + +1: markt, remm, rjung -1: * Last (hopefully) fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494 Clear buffer if not all data is read. Patch provided by Suzuki Yuichiro. http://svn.apache.org/viewvc?rev=647307&view=rev - +1: markt, remm + +1: markt, remm, rjung -1: + rjung: Not sure, if this is the most efficient solution, but + at least it's a fix. * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44391 Handling of escaped characters was incorrect. @@ -129,5 +134,5 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44389 Memory leak on app re-load http://svn.apache.org/viewvc?rev=647339&view=rev - +1: markt, remm + +1: markt, remm, rjung -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648607 - in /tomcat/connectors/trunk/jk/xdocs: miscellaneous/changelog.xml reference/workers.xml
Author: rjung Date: Wed Apr 16 01:03:38 2008 New Revision: 648607 URL: http://svn.apache.org/viewvc?rev=648607&view=rev Log: Fix docs for worker attribute "secret". Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml tomcat/connectors/trunk/jk/xdocs/reference/workers.xml Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=648607&r1=648606&r2=648607&view=diff == --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Apr 16 01:03:38 2008 @@ -43,6 +43,9 @@ + +Fix docs for worker attribute "secret". (rjung) + Detect correct plugin name for various web servers via additional preprocessor defines. (rjung) Modified: tomcat/connectors/trunk/jk/xdocs/reference/workers.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/workers.xml?rev=648607&r1=648606&r2=648607&view=diff == --- tomcat/connectors/trunk/jk/xdocs/reference/workers.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/reference/workers.xml Wed Apr 16 01:03:38 2008 @@ -663,7 +663,7 @@ This features has been added in jk 1.2.6 to avoid problem with hung Tomcat's and works on all -servlet engines supporting ajp13. The variable JK_REPLY_TIMEOUT has been added in version 1.2.27. +servlet engines supporting ajp13. The variable JK_REPLY_TIMEOUT has been added in version 1.2.27. @@ -762,8 +762,7 @@ You can set a secret keyword on the Tomcat AJP Connector. Then only requests from workers with the same secret keyword will be accepted. -Use request.useSecret="true" and request.secret="secret key word" -in your Tomcat AJP Connector configuration. +Use request.secret="secret key word" in your Tomcat AJP Connector configuration. If you set a secret on a load balancer, all its members will inherit this secret. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41886] "h:commanButton" and "h:commandLink" does not work with "onclick"
https://issues.apache.org/bugzilla/show_bug.cgi?id=41886 Morten Egelund Rasmussen <[EMAIL PROTECTED]> changed: What|Removed |Added CC||[EMAIL PROTECTED] Severity|normal |major --- Comment #1 from Morten Egelund Rasmussen <[EMAIL PROTECTED]> 2008-04-16 02:51:59 PST --- Very annoying bug. Any ideas on when this will be fixed? Using 6.0.16 and bug is still there :-( -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41886] "h:commanButton" and "h:commandLink" does not work with "onclick"
https://issues.apache.org/bugzilla/show_bug.cgi?id=41886 Morten Egelund Rasmussen <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Morten Egelund Rasmussen <[EMAIL PROTECTED]> 2008-04-16 03:04:17 PST --- Hahaha... Bug was completely misfiled. This is a JSF bug. Sorry for bumping. Upgrading to latest Mojarra fixed this. Closing bug. -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648682 - in /tomcat/connectors/trunk/jk: native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml xdocs/reference/apache.xml
Author: mturk
Date: Wed Apr 16 05:37:22 2008
New Revision: 648682
URL: http://svn.apache.org/viewvc?rev=648682&view=rev
Log:
Add watchdog thread to Apache 2. It creates additional thread in child process
if set for unatended maintenance of the workers
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=648682&r1=648681&r2=648682&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Apr 16 05:37:22
2008
@@ -233,6 +233,8 @@
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_watchdog_interval = 0;
+
/*
* Worker stuff
*/
@@ -1143,6 +1145,26 @@
}
/*
+ * JkWatchdogInterval Directive Handling
+ *
+ * JkWatchdogInterval seconds
+ */
+
+static const char *jk_set_watchdog_interval(cmd_parms * cmd,
+void *dummy, const char
*watchdog_interval)
+{
+#if APR_HAS_THREADS
+jk_watchdog_interval = atoi(watchdog_interval);
+if (jk_watchdog_interval < 0) {
+jk_watchdog_interval = 0;
+}
+return NULL;
+#else
+return "APR was compiled without threading support. Cannot create watchdog
thread";
+#endif
+}
+
+/*
* JkLogFile Directive Handling
*
* JkLogFile file
@@ -1996,6 +2018,15 @@
"the reload check interval of the mount file"),
/*
+ * JkWatchdogInterval specifies the maintain interval for the
+ * wathdog thread.
+ *
+ * Default value is: 0 meaning watchdog thread will not be created
+ */
+AP_INIT_TAKE1("JkWatchdogInterval", jk_set_watchdog_interval, NULL,
RSRC_CONF,
+ "maintain interval of the watchdog thread"),
+
+/*
* JkMount mounts a url prefix to a worker (the worker need to be
* defined in the worker properties file.
*/
@@ -2273,8 +2304,9 @@
private_data.read_body_started = JK_FALSE;
private_data.r = r;
-wc_maintain(xconf->log);
-
+/* Maintain will be done by watchdog thread */
+ if (!jk_watchdog_interval)
+ wc_maintain(xconf->log);
jk_init_ws_service(&s);
s.ws_private = &private_data;
s.pool = &private_data.p;
@@ -2725,6 +2757,28 @@
return -1;
}
+#if APR_HAS_THREADS
+
+static void * APR_THREAD_FUNC jk_watchdog_func(apr_thread_t *thd, void *data)
+{
+int i;
+jk_server_conf_t *conf = (jk_server_conf_t *)data;
+
+if (JK_IS_DEBUG_LEVEL(conf->log))
+jk_log(conf->log, JK_LOG_DEBUG,
+ "Watchdog initialized");
+for (;;) {
+apr_sleep(apr_time_from_sec(60));
+if (JK_IS_DEBUG_LEVEL(conf->log))
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "Watchdog running");
+wc_maintain(conf->log);
+}
+apr_thread_exit(thd, 0);
+return NULL;
+}
+
+#endif
/** Standard apache callback, initialize jk.
*/
@@ -2733,6 +2787,7 @@
jk_server_conf_t *conf;
apr_status_t rv;
int rc;
+apr_thread_t *wdt;
conf = ap_get_module_config(s->module_config, &jk_module);
@@ -2743,6 +2798,16 @@
}
JK_TRACE_ENTER(conf->log);
+
+if (jk_watchdog_interval) {
+#if APR_HAS_THREADS
+rv = apr_thread_create(&wdt, NULL, jk_watchdog_func, conf, pconf);
+if (rv != APR_SUCCESS) {
+ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
+ "mod_jk: could not init JK watchdog thread");
+}
+#endif
+}
if ((rc = jk_shm_attach(jk_shm_file, jk_shm_size, conf->log)) == 0) {
apr_pool_cleanup_register(pconf, conf->log, jk_cleanup_shmem,
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=648682&r1=648681&r2=648682&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Apr 16
05:37:22 2008
@@ -43,6 +43,10 @@
+
+Add JkWatchdogInterval directive for Apache 2.0
+that allows unatended maintenance of the workers. (mturk)
+
Fix docs for worker attribute "secret". (rjung)
Modified: tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/apache.xml?rev=648682&r1=648681&r2=648682&view=diff
==
svn commit: r648686 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Author: mturk
Date: Wed Apr 16 05:45:57 2008
New Revision: 648686
URL: http://svn.apache.org/viewvc?rev=648686&view=rev
Log:
TAB police and small copy/paste mistake
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=648686&r1=648685&r2=648686&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Apr 16 05:45:57
2008
@@ -2305,8 +2305,8 @@
private_data.r = r;
/* Maintain will be done by watchdog thread */
- if (!jk_watchdog_interval)
- wc_maintain(xconf->log);
+if (!jk_watchdog_interval)
+wc_maintain(xconf->log);
jk_init_ws_service(&s);
s.ws_private = &private_data;
s.pool = &private_data.p;
@@ -2768,7 +2768,7 @@
jk_log(conf->log, JK_LOG_DEBUG,
"Watchdog initialized");
for (;;) {
-apr_sleep(apr_time_from_sec(60));
+apr_sleep(apr_time_from_sec(jk_watchdog_interval));
if (JK_IS_DEBUG_LEVEL(conf->log))
jk_log(conf->log, JK_LOG_DEBUG,
"Watchdog running");
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r648682 - in /tomcat/connectors/trunk/jk: native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml xdocs/reference/apache.xml
[EMAIL PROTECTED] wrote: Author: mturk Date: Wed Apr 16 05:37:22 2008 New Revision: 648682 URL: http://svn.apache.org/viewvc?rev=648682&view=rev Log: Add watchdog thread to Apache 2. It creates additional thread in child process if set for unatended maintenance of the workers Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml tomcat/connectors/trunk/jk/xdocs/reference/apache.xml What happens the maintenance occurs when processing a request. Cheers Jean-Frederic - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r648682 - in /tomcat/connectors/trunk/jk: native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml xdocs/reference/apache.xml
jean-frederic clere wrote: [EMAIL PROTECTED] wrote: Author: mturk Date: Wed Apr 16 05:37:22 2008 New Revision: 648682 URL: http://svn.apache.org/viewvc?rev=648682&view=rev Log: Add watchdog thread to Apache 2. It creates additional thread in child process if set for unatended maintenance of the workers Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml tomcat/connectors/trunk/jk/xdocs/reference/apache.xml What happens the maintenance occurs when processing a request. The same thing as it happens right now with concurrent requests. Regards -- (TM) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648863 - in /tomcat/tc6.0.x/trunk: STATUS.txt conf/web.xml webapps/docs/changelog.xml
Author: markt Date: Wed Apr 16 14:35:20 2008 New Revision: 648863 URL: http://svn.apache.org/viewvc?rev=648863&view=rev Log: Update web.xml to reflect packaging of CGI and SSI. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/conf/web.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648863&r1=648862&r2=648863&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:35:20 2008 @@ -55,11 +55,6 @@ +0: remm: do we really want to fix these sort of "bugs" ? -1: -* Update comments re JAR renaming in web.xml - http://svn.apache.org/viewvc?rev=639771&view=rev - +1: markt, fhanik, rjung - -1: - * Fix NIO/Sendfile problem http://svn.apache.org/viewvc?rev=644858&view=rev http://svn.apache.org/viewvc?rev=644860&view=rev Modified: tomcat/tc6.0.x/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?rev=648863&r1=648862&r2=648863&view=diff == --- tomcat/tc6.0.x/trunk/conf/web.xml (original) +++ tomcat/tc6.0.x/trunk/conf/web.xml Wed Apr 16 14:35:20 2008 @@ -277,11 +277,6 @@ - - - - - - - - - - - - - -
DO NOT REPLY [Bug 44759] can' t run ant task dist-javadoc as described in BUILDING.txt
https://issues.apache.org/bugzilla/show_bug.cgi?id=44759 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-16 14:37:23 PST --- This has been fixed in svn for 6.0.x and will be in 6.0.17 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648865 - in /tomcat/tc6.0.x/trunk: STATUS.txt dist.xml webapps/docs/changelog.xml
Author: markt Date: Wed Apr 16 14:40:06 2008 New Revision: 648865 URL: http://svn.apache.org/viewvc?rev=648865&view=rev Log: Fix JavaDoc build. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/dist.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648865&r1=648864&r2=648865&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:40:06 2008 @@ -61,12 +61,6 @@ +1: fhanik, markt, pero -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44759 - Need source to build java docs - http://svn.apache.org/viewvc?rev=645169&view=rev - +1: markt,fhanik,rjung - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42662 http://svn.apache.org/viewvc?view=rev&revision=645184 +1: fhanik Modified: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=648865&r1=648864&r2=648865&view=diff == --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Wed Apr 16 14:40:06 2008 @@ -356,14 +356,15 @@ - + 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=648865&r1=648864&r2=648865&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 16 14:40:06 2008 @@ -174,8 +174,11 @@ - Improve the Tests for unit tests for the cookie issues. (jfclere) +Improve the Tests for unit tests for the cookie issues. (jfclere) + +Fix build for JavaDoc. Patch provided by Stephen Bannasch. (markt) + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648867 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/runtime/PageContextImpl.java webapps/docs/changelog.xml
Author: markt
Date: Wed Apr 16 14:49:00 2008
New Revision: 648867
URL: http://svn.apache.org/viewvc?rev=648867&view=rev
Log:
Reduce syncs when evaluating EL expressions.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.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=648867&r1=648866&r2=648867&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:49:00 2008
@@ -85,14 +85,6 @@
rjung: Simply use: "return Number.class.isAssignableFrom(type);"
since all other conditions are special cases of this one.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44408
- Avoid bottleneck by calling synchronized method only once
- http://svn.apache.org/viewvc?rev=646889&view=rev
- +1: markt, rjung
- +1: remm (I never tested this was a problem in the past, though, maybe I
didn't test right)
- -1:
- rjung: Please also fix indentation.
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44392
Correct handling of HTML entities in SSI processing
http://svn.apache.org/viewvc?rev=647289&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=648867&r1=648866&r2=648867&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
Wed Apr 16 14:49:00 2008
@@ -70,6 +70,8 @@
*/
public class PageContextImpl extends PageContext {
+ private static final JspFactory jspf = JspFactory.getDefaultFactory();
+
private BodyContentImpl[] outs;
private int depth;
@@ -895,7 +897,7 @@
final ProtectedFunctionMapper functionMap, final
boolean escape)
throws ELException {
Object retValue;
-final ExpressionFactory exprFactory =
JspFactory.getDefaultFactory().getJspApplicationContext(pageContext.getServletContext()).getExpressionFactory();
+final ExpressionFactory exprFactory =
jspf.getJspApplicationContext(pageContext.getServletContext()).getExpressionFactory();
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
retValue = AccessController
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=648867&r1=648866&r2=648867&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 16 14:49:00 2008
@@ -130,6 +130,10 @@
43741: Correctly handle dependencies for tag files in JARs.
(markt)
+
+44408: Reduce synchronisation when evaluating EL
expressions.
+Patch provided by Robert Andersson. (markt)
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44408] EL-expression evaluation slow due to synchronization caused by JspFactory. getDefaultFactory
https://issues.apache.org/bugzilla/show_bug.cgi?id=44408 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-16 14:46:44 PST --- This has been applied to svn for 6.0.x and will be in 6.0.17 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648868 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/connector/InputBuffer.java
Author: markt Date: Wed Apr 16 14:52:38 2008 New Revision: 648868 URL: http://svn.apache.org/viewvc?rev=648868&view=rev Log: More 44494. Fix read when maxHttpHeaderSize > 8192 Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648868&r1=648867&r2=648868&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:52:38 2008 @@ -91,12 +91,6 @@ +1: markt, remm -1: -* Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494 - Fix read when maxHttpHeaderSize > 8192 - http://svn.apache.org/viewvc?rev=647304&view=rev (rjung) - +1: markt, remm, rjung - -1: - * Last (hopefully) fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=44494 Clear buffer if not all data is read. Patch provided by Suzuki Yuichiro. Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=648868&r1=648867&r2=648868&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java Wed Apr 16 14:52:38 2008 @@ -367,7 +367,9 @@ cb.setOffset(0); cb.setEnd(0); } - +int limit = bb.getLength()+cb.getStart(); +if ( cb.getLimit() < limit ) +cb.setLimit(limit); state = CHAR_STATE; conv.convert(bb, cb, bb.getLength()); bb.setOffset(bb.getEnd()); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648869 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/buf/B2CConverter.java
Author: markt
Date: Wed Apr 16 14:55:30 2008
New Revision: 648869
URL: http://svn.apache.org/viewvc?rev=648869&view=rev
Log:
Last (hopefully) fix for bug 44494
Clear buffer if not all data is read.
Patch provided by Suzuki Yuichiro.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648869&r1=648868&r2=648869&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:55:30 2008
@@ -91,15 +91,6 @@
+1: markt, remm
-1:
-* Last (hopefully) fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=44494
- Clear buffer if not all data is read.
- Patch provided by Suzuki Yuichiro.
- http://svn.apache.org/viewvc?rev=647307&view=rev
- +1: markt, remm, rjung
- -1:
- rjung: Not sure, if this is the most efficient solution, but
- at least it's a fix.
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44391
Handling of escaped characters was incorrect.
http://svn.apache.org/viewvc?rev=647316&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=648869&r1=648868&r2=648869&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Wed
Apr 16 14:55:30 2008
@@ -218,6 +218,14 @@
/** Reset the buffer
*/
public final void recycle() {
+try {
+// Must clear super's buffer.
+while (ready()) {
+// InputStreamReader#skip(long) will allocate buffer to skip.
+read();
+}
+} catch(IOException ioe){
+}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44389] Cleanup of org.apache.naming.resources. CacheEntry resources (memory leak)
https://issues.apache.org/bugzilla/show_bug.cgi?id=44389 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-16 14:56:37 PST --- This has been fixed in svn for 6.0.x and will be included in 6.0.17 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r648874 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/ApplicationContext.java webapps/docs/changelog.xml
Author: markt
Date: Wed Apr 16 14:59:35 2008
New Revision: 648874
URL: http://svn.apache.org/viewvc?rev=648874&view=rev
Log:
Fix memory leak when using RequestDispatcher.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.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=648874&r1=648873&r2=648874&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:59:35 2008
@@ -96,9 +96,3 @@
http://svn.apache.org/viewvc?rev=647316&view=rev
+1: markt, remm
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44389
- Memory leak on app re-load
- http://svn.apache.org/viewvc?rev=647339&view=rev
- +1: markt, remm, rjung
- -1:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=648874&r1=648873&r2=648874&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Wed Apr 16 14:59:35 2008
@@ -964,7 +964,7 @@
* Internal class used as thread-local storage when doing path
* mapping during dispatch.
*/
-private final class DispatchData {
+private static final class DispatchData {
public MessageBytes uriMB;
public MappingData mappingData;
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=648874&r1=648873&r2=648874&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 16 14:59:35 2008
@@ -94,6 +94,10 @@
Update web.xml to reflect packaging of SSI and CGI. (markt)
+
+44389: Fix memory leak that occurred if using a
+RequestDispatcher. Patch provided by Arto Huusko. (markt)
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r648605 - /tomcat/tc6.0.x/trunk/STATUS.txt
2008/4/16 <[EMAIL PROTECTED]>: > * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44766 >Handle custom subtypes of java.lang.Number >http://svn.apache.org/viewvc?view=rev&revision=646106 > - +1: markt, remm > + +1: markt, remm, rjung >-1: > + rjung: Simply use: "return Number.class.isAssignableFrom(type);" > + since all other conditions are special cases of this one. > IMHO, Rainer is wrong here. Those other conditions cannot be satisfied with Number.class.isAssignableFrom(type). E.g., the following call returns false, as I have tested with Java 1.6.0_05: Number.class.isAssignableFrom(Integer.TYPE) Best regards, K.Kolinko - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 37458] Datarace on org.apache.catalina.loader. WebappClassLoader
https://issues.apache.org/bugzilla/show_bug.cgi?id=37458 --- Comment #7 from Dave McIntyre <[EMAIL PROTECTED]> 2008-04-16 22:52:03 PST --- (In reply to comment #6) > There are a couple of odd things about your stack trace. > > 1. For 5.5.23, line 1800 of WebappClassLoader doesn't call Package.isSealed(). > It is around 30 lines later. > I agree that this seems odd. I installed a fresh download of 5.5.23 and it started reporting the error as java.lang.NullPointerException at java.lang.Package.isSealed(Package.java:179) at org.apache.catalina.loader.WebappClassLoader.findClassInternal(WebappClassLoader.java:1833) at org.apache.catalina.loader.WebappClassLoader.findClass(WebappClassLoader.java:873) at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1326) at java.lang.ClassLoader.loadClass(ClassLoader.java:299) ... I also tried a fresh install of 5.5.26 and the line numbers changed to java.lang.NullPointerException at java.lang.Package.isSealed(Package.java:179) at org.apache.catalina.loader.WebappClassLoader.findClassInternal(WebappClassLoader.java:1839) at org.apache.catalina.loader.WebappClassLoader.findClass(WebappClassLoader.java:875) at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1330) > 2. I don't understand why the NPE is thrown from within java.lang.Package. If > pkg was null, I'd expect to see the NPE in WebappClassLoader > It's not pkg that is null, it is entry.codeBase which is null. My fault for posting incorrect line numbers. > 3. I have checked the source for 1.4, 1.5 and 1.6 and don't see how > Package.isSealed() could throw a NPE. > It is not the call to Package.isSealed() but the call to Package.isSealed(URL url) which causes the problem: it throws an NPE trying to return "url.equals(sealBase)". > I have reviewed the patch you referred to and I do not see a code path by > which > this bug could re-appear. > In the initial fix for this bug (revision 469360), this section of code was included in a block which was synchronised on "entry" which contained a smaller block synchronised on "this". In revision 510801 the synchronisation was changed to synchronise the outer block on "this", with no synchronisation on "entry". The problem seems to me to be that although "entry" is a local variable, the object it references is obtained externally so two different threads are able to access the same object, and thus one thread is able to set entry.codeBase to null (at line 1853 in 5.5.23) after the other thread has entered the block and committed itself to calling pkg.isSealed(entry.codeBase). > The best place to get help on this is the users list. Before posting please > try > a clean 5.5.26 build and also post the OS and JDK you are using. If the > discussion there concludes there is a bug, please create a new issue to track > it. > Sorry for replying directly here but I thought it was appropriate to reply directly to your comments. As I say, I see this with a clean 5.5.26 build, running in CentOS release 4.6 (Final) under Java HotSpot(TM) Client VM (build 1.5.0_14-b03, mixed mode, sharing). -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 37458] Datarace on org.apache.catalina.loader. WebappClassLoader
https://issues.apache.org/bugzilla/show_bug.cgi?id=37458 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED | -- 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
