Re: svn commit: r648682 - in /tomcat/connectors/trunk/jk: native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml xdocs/reference/apache.xml
Mladen Turk wrote: 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. won't moving JK_LEAVE_CS after the ae->last_access = now; in ajp_get_endpoint() be enough to prevent the problem? Cheers Jean-Frederic Regards -- (TM) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r648605 - /tomcat/tc6.0.x/trunk/STATUS.txt
Konstantin Kolinko wrote: 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) Thank you, you are right. I tested with the object types, not the primitive ones. Best regards, K.Kolinko - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649023 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Thu Apr 17 02:35:48 2008 New Revision: 649023 URL: http://svn.apache.org/viewvc?rev=649023&view=rev Log: Remove wrong optimization remark. 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=649023&r1=649022&r2=649023&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 02:35:48 2008 @@ -82,8 +82,6 @@ http://svn.apache.org/viewvc?view=rev&revision=646106 +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=44392 Correct handling of HTML entities in SSI processing - 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: Mladen Turk wrote: 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. won't moving JK_LEAVE_CS after the ae->last_access = now; in ajp_get_endpoint() be enough to prevent the problem? what problem? Cheers -- (TM) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649041 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Author: rjung
Date: Thu Apr 17 03:29:35 2008
New Revision: 649041
URL: http://svn.apache.org/viewvc?rev=649041&view=rev
Log:
Remove trailing white space.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=649041&r1=649040&r2=649041&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Thu Apr 17 03:29:35
2008
@@ -657,7 +657,7 @@
static int find_by_session(jk_ws_service_t *s,
lb_worker_t *p,
- const char *name,
+ const char *name,
jk_logger_t *l)
{
@@ -1043,7 +1043,7 @@
jk_log(l, JK_LOG_ERROR,
"Failed allocating private worker state memory");
JK_TRACE_EXIT(l);
-return JK_SERVER_ERROR;
+return JK_SERVER_ERROR;
}
jk_shm_lock();
@@ -1062,14 +1062,14 @@
jk_log(l, JK_LOG_ERROR,
"Failed allocating AJP message");
JK_TRACE_EXIT(l);
-return JK_SERVER_ERROR;
+return JK_SERVER_ERROR;
}
if (jk_b_set_buffer_size(s->reco_buf, p->worker->max_packet_size)) {
*is_error = JK_HTTP_SERVER_ERROR;
jk_log(l, JK_LOG_ERROR,
"Failed allocating AJP message buffer");
JK_TRACE_EXIT(l);
-return JK_SERVER_ERROR;
+return JK_SERVER_ERROR;
}
jk_b_reset(s->reco_buf);
s->reco_status = RECO_INITED;
@@ -1118,7 +1118,7 @@
}
if (p->worker->lblock == JK_LB_LOCK_PESSIMISTIC)
jk_shm_unlock();
-
+
while ((!(r=rec->worker->get_endpoint(rec->worker, &end, l)) ||
!end) && (retry < p->worker->retries)) {
retry++;
retry_wait *=2;
-
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
Mladen Turk wrote: jean-frederic clere wrote: Mladen Turk wrote: 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. won't moving JK_LEAVE_CS after the ae->last_access = now; in ajp_get_endpoint() be enough to prevent the problem? what problem? We are going to have a endpoint used by 2 threads at the same time that is bad, no? Cheers Jean-Frederic Cheers -- (TM) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - 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: Mladen Turk wrote: jean-frederic clere wrote: Mladen Turk wrote: 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. won't moving JK_LEAVE_CS after the ae->last_access = now; in ajp_get_endpoint() be enough to prevent the problem? what problem? We are going to have a endpoint used by 2 threads at the same time that is bad, no? I don't think we'll have. Watchdog thread here behaves just like any concurrent request, so if we don't have contention between concurrent requests we won't have with the watchdog thread neither thought. Cheers -- (TM) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44832] New: JK 1.2.26 - can not compile with IBM compiler
https://issues.apache.org/bugzilla/show_bug.cgi?id=44832
Summary: JK 1.2.26 - can not compile with IBM compiler
Product: Tomcat 6
Version: unspecified
Platform: Other
OS/Version: AIX
Status: NEW
Severity: normal
Priority: P2
Component: Native:JK
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
JK 1.2.26 can not be compiled on IBM AIX with IBM VAC C compiler because of
non-C-style comments used in native/common/jk_ajp_common.c:
native/common/jk_ajp_common.c:2074://if (p->worker->recovery_opts &
RECOVER_ABORT_IF_CLIENTERROR) {
native/common/jk_ajp_common.c:2075:///* Mark the endpoint for
shutdown */
native/common/jk_ajp_common.c:2076://p->reuse = JK_FALSE;
native/common/jk_ajp_common.c:2077://}
native/common/jk_ajp_common.c:2110://if
(p->worker->recovery_opts & RECOVER_ABORT_IF_CLIENTERROR) {
native/common/jk_ajp_common.c:2111:///* Mark the endpoint
for shutdown */
native/common/jk_ajp_common.c:2112://p->reuse = JK_FALSE;
native/common/jk_ajp_common.c:2113://}
native/common/jk_ajp_common.c:2126://if
(p->worker->recovery_opts & RECOVER_ABORT_IF_CLIENTERROR) {
native/common/jk_ajp_common.c:2127:///* Mark the endpoint
for shutdown */
native/common/jk_ajp_common.c:2128://p->reuse = JK_FALSE;
native/common/jk_ajp_common.c:2129://}
error list:
"./jk_ajp_common.c", line 2074.1: 1506-046 (S) Syntax error.
"./jk_ajp_common.c", line 2075.1: 1506-046 (S) Syntax error.
"./jk_ajp_common.c", line 2077.1: 1506-046 (S) Syntax error.
"./jk_ajp_common.c", line 2110.1: 1506-046 (S) Syntax error.
"./jk_ajp_common.c", line 2111.1: 1506-046 (S) Syntax error.
"./jk_ajp_common.c", line 2113.1: 1506-046 (S) Syntax error.
"./jk_ajp_common.c", line 2126.1: 1506-046 (S) Syntax error.
"./jk_ajp_common.c", line 2127.1: 1506-046 (S) Syntax error.
"./jk_ajp_common.c", line 2129.1: 1506-046 (S) Syntax error.
--
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: r649092 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
Author: mturk
Date: Thu Apr 17 06:36:16 2008
New Revision: 649092
URL: http://svn.apache.org/viewvc?rev=649092&view=rev
Log:
Fix 44832 by not using c++ style comments in C code
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?rev=649092&r1=649091&r2=649092&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Thu Apr 17
06:36:16 2008
@@ -2190,10 +2190,12 @@
/* This doesn't make sense, because we already set reuse */
/* to JK_FALSE at the beginning of service() and only set it to
true again after */
/* the whole response has beend received (callback
JK_AJP13_END_RESPONSE). */
-//if (aw->recovery_opts & RECOVER_ABORT_IF_CLIENTERROR) {
-///* Mark the endpoint for shutdown */
-//p->reuse = JK_FALSE;
-//}
+#if 0
+if (aw->recovery_opts & RECOVER_ABORT_IF_CLIENTERROR) {
+/* Mark the endpoint for shutdown */
+p->reuse = JK_FALSE;
+}
+#endif
}
else if (err == JK_FATAL_ERROR) {
*is_error = JK_HTTP_SERVER_BUSY;
@@ -2228,10 +2230,12 @@
/* This doesn't make sense, because we already set reuse */
/* to JK_FALSE at the beginning of service() and only set it
to true again after */
/* the whole response has beend received (callback
JK_AJP13_END_RESPONSE). */
-//if (aw->recovery_opts & RECOVER_ABORT_IF_CLIENTERROR) {
-///* Mark the endpoint for shutdown */
-//p->reuse = JK_FALSE;
-//}
+#if 0
+if (aw->recovery_opts & RECOVER_ABORT_IF_CLIENTERROR) {
+/* Mark the endpoint for shutdown */
+p->reuse = JK_FALSE;
+}
+#endif
}
else if (err == JK_CLIENT_WR_ERROR) {
/* XXX: Is this correct to log this as 200? */
@@ -2245,10 +2249,12 @@
/* This doesn't make sense, because we already set reuse */
/* to JK_FALSE at the beginning of service() and only set it
to true again after */
/* the whole response has beend received (callback
JK_AJP13_END_RESPONSE). */
-//if (aw->recovery_opts & RECOVER_ABORT_IF_CLIENTERROR) {
-///* Mark the endpoint for shutdown */
-//p->reuse = JK_FALSE;
-//}
+#if 0
+if (aw->recovery_opts & RECOVER_ABORT_IF_CLIENTERROR) {
+/* Mark the endpoint for shutdown */
+p->reuse = JK_FALSE;
+}
+#endif
}
else if (err == JK_FATAL_ERROR) {
*is_error = JK_HTTP_SERVER_ERROR;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44832] JK 1.2.26 - can not compile with IBM compiler
https://issues.apache.org/bugzilla/show_bug.cgi?id=44832 Mladen Turk <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mladen Turk <[EMAIL PROTECTED]> 2008-04-17 06:34:10 PST --- Fixed in the SVN. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649095 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml
Author: fhanik
Date: Thu Apr 17 06:40:43 2008
New Revision: 649095
URL: http://svn.apache.org/viewvc?rev=649095&view=rev
Log:
Apply patch
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.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=649095&r1=649094&r2=649095&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 06:40:43 2008
@@ -55,12 +55,6 @@
+0: remm: do we really want to fix these sort of "bugs" ?
-1:
-* Fix NIO/Sendfile problem
- http://svn.apache.org/viewvc?rev=644858&view=rev
- http://svn.apache.org/viewvc?rev=644860&view=rev
- +1: fhanik, markt, pero
- -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/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=649095&r1=649094&r2=649095&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
Apr 17 06:40:43 2008
@@ -1607,10 +1607,11 @@
}
if ( sd.length <= 0 ) {
attachment.setSendfileData(null);
-if ( sd.keepAlive )
+if ( sd.keepAlive ) {
if (reg) reg(sk,attachment,SelectionKey.OP_READ);
-else
+} else {
cancelledKey(sk,SocketStatus.STOP,false);
+}
} else if ( attachment.interestOps() == 0 && reg ) {
reg(sk,attachment,SelectionKey.OP_WRITE);
}
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=649095&r1=649094&r2=649095&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Apr 17 06:40:43 2008
@@ -103,6 +103,10 @@
+NIO: Fix bug in NIO sendfile, symptoms during heavy traffic is that
connection don't get closed. For previous versions, one can disable sendfile to
work
+around the problem. (fhanik)
+
+
APR: Allow to specify the "random device" to use to collect the
entropy. (jfclere)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649097 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Thu Apr 17 06:42:06 2008 New Revision: 649097 URL: http://svn.apache.org/viewvc?rev=649097&view=rev Log: cast votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=649097&r1=649096&r2=649097&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 06:42:06 2008 @@ -68,7 +68,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44428 Prevent NPE http://svn.apache.org/viewvc?rev=646574&view=rev - +1: markt, remm + +1: markt, remm, fhanik -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44766 @@ -80,11 +80,11 @@ * 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 - +1: markt, remm + +1: markt, remm, fhanik -1: * 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 - +1: markt, remm + +1: markt, remm, fhanik -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r648019 - /tomcat/tc6.0.x/trunk/STATUS.txt
+1, absolutely, I think the remaining patches, are small and easy and we can get them in, wanna set a date for the tag I'll do the same for 5.5 but trail it a couple of days after so we can get the votes in If possible, please review * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42662 http://svn.apache.org/viewvc?view=rev&revision=645184 +1: fhanik it would be nice to get this one in too. Filip Remy Maucherat wrote: On Mon, 2008-04-14 at 21:51 +, [EMAIL PROTECTED] wrote: Author: markt Date: Mon Apr 14 14:51:34 2008 New Revision: 648019 URL: http://svn.apache.org/viewvc?rev=648019&view=rev Log: Proposal Since the biggest problems are supposedly fixed, maybe it would be time for a new build ? Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44833] New: DeltaSession Externalization Problem
https://issues.apache.org/bugzilla/show_bug.cgi?id=44833 Summary: DeltaSession Externalization Problem Product: Tomcat 6 Version: 6.0.16 Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Cluster AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Location: class org.apache.catalina.ha.session.DeltaManager methods deserializeSessions() ObjectInputStream ois = null; ... DeltaSession session = (DeltaSession) createEmptySession(); session.readObjectData(ois); and serializeSessions() ObjectOutputStream oos = null; ... ((DeltaSession)currentSessions[i]).writeObjectData(oos); Description: In both cases methods StandardSession.readObjectData(ObjectInputStream) and StandardSession.writeObjectData(ObjectOutputStream) will be invoked instead of expected invokation of methods DeltaManager.readObjectData(ObjectInput) and DeltaManager.writeObjectData(ObjectOutput). -- 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: r649107 - /tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
Author: mturk
Date: Thu Apr 17 06:56:08 2008
New Revision: 649107
URL: http://svn.apache.org/viewvc?rev=649107&view=rev
Log:
Add watchdog thread to IIS as well
Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=649107&r1=649106&r2=649107&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Thu Apr 17 06:56:08
2008
@@ -103,6 +103,7 @@
#define STRIP_SESSION_TAG ("strip_session")
#define AUTH_COMPLETE_TAG ("auth_complete")
#define REJECT_UNSAFE_TAG ("reject_unsafe")
+#define WATCHDOG_INTERVAL_TAG ("watchdog_interval")
#define TRANSLATE_HEADER("Translate:")
@@ -198,6 +199,7 @@
static DWORD auth_notification_flags = 0;
static int use_auth_notification_flags = 1;
static int reject_unsafe = 0;
+static int watchdog_interval = 0;
#define URI_SELECT_OPT_PARSED 0
#define URI_SELECT_OPT_UNPARSED 1
@@ -1486,7 +1488,8 @@
jk_pool_atom_t buf[SMALL_POOL_SIZE];
char *worker_name;
-wc_maintain(logger);
+if (!watchdog_interval)
+wc_maintain(logger);
jk_init_ws_service(&s);
jk_open_pool(&private_data.p, buf, sizeof(buf));
@@ -1650,6 +1653,25 @@
return fReturn;
}
+static DWORD WINAPI watchdog_thread(void *param)
+{
+if (JK_IS_DEBUG_LEVEL(logger)) {
+jk_log(logger, JK_LOG_DEBUG,
+ "Watchdog thread initialized");
+}
+while (is_inited) {
+Sleep(watchdog_interval * 1000);
+if (!is_inited)
+break;
+if (JK_IS_DEBUG_LEVEL(logger)) {
+jk_log(logger, JK_LOG_DEBUG,
+ "Watchdog thread running");
+}
+wc_maintain(logger);
+}
+return 0;
+}
+
static int init_jk(char *serverName)
{
char shm_name[MAX_PATH];
@@ -1799,6 +1821,9 @@
}
}
if (rc) {
+HANDLE wt;
+DWORD wi;
+wt = CreateThread(NULL, 0, watchdog_thread, NULL, 0, &wi);
jk_log(logger, JK_LOG_INFO, "%s initialized", (VERSION_STRING) );
}
return rc;
@@ -1885,6 +1910,7 @@
strip_session = get_config_bool(src, STRIP_SESSION_TAG, JK_FALSE);
use_auth_notification_flags = get_config_int(src, AUTH_COMPLETE_TAG, 1);
reject_unsafe = get_config_bool(src, REJECT_UNSAFE_TAG, JK_FALSE);
+watchdog_interval = get_config_int(src, WATCHDOG_INTERVAL_TAG, 0);
if (using_ini_file) {
jk_map_free(&map);
}
@@ -1993,7 +2019,7 @@
if (!(huge_buf = jk_pool_alloc(&private_data->p, MAX_PACKET_SIZE))) {
JK_TRACE_EXIT(logger);
-return JK_FALSE;
+return JK_FALSE;
}
huge_buf_sz = MAX_PACKET_SIZE;
GET_SERVER_VARIABLE_VALUE(HTTP_WORKER_HEADER_NAME, (*worker_name));
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649195 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/el/lang/FunctionMapperImpl.java webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 17 10:27:26 2008
New Revision: 649195
URL: http://svn.apache.org/viewvc?rev=649195&view=rev
Log:
Fix bug 44428. Possible NPE in serialization.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.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=649195&r1=649194&r2=649195&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 10:27:26 2008
@@ -65,12 +65,6 @@
+1: jfclere, rjung, fhanik, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44428
- Prevent NPE
- http://svn.apache.org/viewvc?rev=646574&view=rev
- +1: markt, remm, fhanik
- -1:
-
* 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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=649195&r1=649194&r2=649195&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Thu
Apr 17 10:27:26 2008
@@ -120,6 +120,8 @@
public void writeExternal(ObjectOutput out) throws IOException {
out.writeUTF((this.prefix != null) ? this.prefix : "");
out.writeUTF(this.localName);
+// make sure m isn't null
+getMethod();
out.writeUTF((this.owner != null) ?
this.owner :
this.m.getDeclaringClass().getName());
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=649195&r1=649194&r2=649195&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Apr 17 10:27:26 2008
@@ -142,6 +142,9 @@
44408: Reduce synchronisation when evaluating EL
expressions.
Patch provided by Robert Andersson. (markt)
+
+44428: Fix possible NPE during serialization. (markt)
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44428] FunctionMapperImpl. Function throws a NPE in certain circumstances
https://issues.apache.org/bugzilla/show_bug.cgi?id=44428 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-17 10:25:44 PST --- This bug has been fixed in svn 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: r649198 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/el/lang/ELArithmetic.java webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 17 10:39:46 2008
New Revision: 649198
URL: http://svn.apache.org/viewvc?rev=649198&view=rev
Log:
Fix bug 44766. EL doesn't coerce custom Number subclasses.
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/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=649198&r1=649197&r2=649198&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 10:39:46 2008
@@ -65,12 +65,6 @@
+1: jfclere, rjung, fhanik, remm
-1:
-* 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, rjung
- -1:
-
* 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/el/lang/ELArithmetic.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=649198&r1=649197&r2=649198&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 Thu Apr 17
10:39:46 2008
@@ -324,8 +324,11 @@
return (obj != null && isNumberType(obj.getClass()));
}
-public final static boolean isNumberType(final Class type) {
-return type == (java.lang.Long.class) || type == Long.TYPE || type ==
(java.lang.Double.class) || type == Double.TYPE || type ==
(java.lang.Byte.class) || type == Byte.TYPE || type == (java.lang.Short.class)
|| type == Short.TYPE || type == (java.lang.Integer.class) || type ==
Integer.TYPE || type == (java.lang.Float.class) || type == Float.TYPE || type
== (java.math.BigInteger.class) || type == (java.math.BigDecimal.class);
+public final static boolean isNumberType(final Class type) {
+return type == Long.TYPE || type == Double.TYPE ||
+type == Byte.TYPE || type == Short.TYPE ||
+type == Integer.TYPE || type == Float.TYPE ||
+Number.class.isAssignableFrom(type);
}
/**
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=649198&r1=649197&r2=649198&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Apr 17 10:39:46 2008
@@ -145,6 +145,9 @@
44428: Fix possible NPE during serialization. (markt)
+
+44766: EL doesn't coerce custom Number subclasses. (markt)
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44766] Tomcat's EL implementation doesn' t coerce custom Number subclasses
https://issues.apache.org/bugzilla/show_bug.cgi?id=44766 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-17 10:37:36 PST --- The patch has been applied to 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: r649203 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ssi/SSIEcho.java java/org/apache/catalina/ssi/SSIMediator.java webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 17 10:47:19 2008
New Revision: 649203
URL: http://svn.apache.org/viewvc?rev=649203&view=rev
Log:
Fix bug 44392. Handle HTML entities correctly in SSI processing.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIEcho.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.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=649203&r1=649202&r2=649203&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 10:47:19 2008
@@ -65,12 +65,6 @@
+1: jfclere, rjung, fhanik, remm
-1:
-* 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
- +1: markt, remm, fhanik
- -1:
-
* 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/catalina/ssi/SSIEcho.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIEcho.java?rev=649203&r1=649202&r2=649203&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIEcho.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIEcho.java Thu Apr 17
10:47:19 2008
@@ -37,20 +37,14 @@
*/
public long process(SSIMediator ssiMediator, String commandName,
String[] paramNames, String[] paramValues, PrintWriter writer) {
- long lastModified = 0;
String encoding = DEFAULT_ENCODING;
+String originalValue = null;
String errorMessage = ssiMediator.getConfigErrMsg();
for (int i = 0; i < paramNames.length; i++) {
String paramName = paramNames[i];
String paramValue = paramValues[i];
if (paramName.equalsIgnoreCase("var")) {
-String variableValue = ssiMediator.getVariableValue(
-paramValue, encoding);
-if (variableValue == null) {
-variableValue = MISSING_VARIABLE_VALUE;
-}
-writer.write(variableValue);
-lastModified = System.currentTimeMillis();
+originalValue = paramValue;
} else if (paramName.equalsIgnoreCase("encoding")) {
if (isValidEncoding(paramValue)) {
encoding = paramValue;
@@ -63,7 +57,13 @@
writer.write(errorMessage);
}
}
-return lastModified;
+String variableValue = ssiMediator.getVariableValue(
+originalValue, encoding);
+if (variableValue == null) {
+variableValue = MISSING_VARIABLE_VALUE;
+}
+writer.write(variableValue);
+return System.currentTimeMillis();
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java?rev=649203&r1=649202&r2=649203&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java Thu Apr
17 10:47:19 2008
@@ -27,6 +27,7 @@
import org.apache.catalina.util.DateTool;
import org.apache.catalina.util.Strftime;
import org.apache.catalina.util.URLEncoder;
+import org.apache.tomcat.util.http.HttpMessages;
/**
* Allows the different SSICommand implementations to share data/talk to each
* other
@@ -205,10 +206,31 @@
* new resolved string.
*/
public String substituteVariables(String val) {
-// If it has no variable references then no work
+// If it has no references or HTML entities then no work
// need to be done
-if (val.indexOf('$') < 0) return val;
+if (val.indexOf('$') < 0 && val.indexOf('&') < 0) return val;
+
+// HTML decoding
+val.replace("<", "<");
+val.replace(">", ">");
+val.replace(""", "\"");
+val.replace("&", "&");
+
StringBuffer sb = new StringBuffer(val);
+int charStart = sb.indexOf("&#");
+while (charStart > -1) {
+int charEnd = sb.indexOf(";", charStart);
+if (charEnd > -1) {
+char c = (char) Integer.parseInt(
+sb.substring(charStart + 2, charEnd));
+sb.delete(charStart, charEnd + 1);
+sb.insert(charStart, c);
+charStart = sb.indexOf("&#");
+
DO NOT REPLY [Bug 44392] HTML entities not resolved in SSI filter
https://issues.apache.org/bugzilla/show_bug.cgi?id=44392 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-17 10:44:47 PST --- The patch has been applied to 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: r649207 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ssi/SSIProcessor.java webapps/docs/changelog.xml
Author: markt
Date: Thu Apr 17 10:55:30 2008
New Revision: 649207
URL: http://svn.apache.org/viewvc?rev=649207&view=rev
Log:
Fix bug 44391. Correct handling of escaped values in SSI processing.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.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=649207&r1=649206&r2=649207&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 10:55:30 2008
@@ -64,9 +64,3 @@
http://svn.apache.org/viewvc?view=rev&revision=645428
+1: jfclere, rjung, fhanik, remm
-1:
-
-* 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
- +1: markt, remm, fhanik
- -1:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java?rev=649207&r1=649206&r2=649207&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java Thu Apr
17 10:55:30 2008
@@ -208,11 +208,10 @@
// Need to skip escaped characters
if (c == '\\' && !escaped) {
escaped = true;
-bIdx++;
continue;
}
+if (c == '"' && !escaped) quotes++;
escaped = false;
-if (c == '"') quotes++;
}
}
}
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=649207&r1=649206&r2=649207&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Apr 17 10:55:30 2008
@@ -117,6 +117,10 @@
Caldarale. (markt/jim)
+44391: Correct handling of escaped values in SSI processing.
+(markt)
+
+
44392: HTML entities now handled correctly in SSI
processing.
(markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44391] SSI handling of escaped characters broken
https://issues.apache.org/bugzilla/show_bug.cgi?id=44391 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-17 10:53:10 PST --- The patch has been applied to 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: r649210 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 17 11:03:38 2008 New Revision: 649210 URL: http://svn.apache.org/viewvc?rev=649210&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=649210&r1=649209&r2=649210&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 11:03:38 2008 @@ -57,7 +57,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42662 http://svn.apache.org/viewvc?view=rev&revision=645184 - +1: fhanik + +1: fhanik, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44595 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44835] New: Servlet becomes unavailable if any class is updated during runtime.
https://issues.apache.org/bugzilla/show_bug.cgi?id=44835 Summary: Servlet becomes unavailable if any class is updated during runtime. Product: Tomcat 6 Version: 6.0.16 Platform: PC OS/Version: Windows XP Status: NEW Severity: regression Priority: P2 Component: Servlet & JSP API AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] If any class is updated (file is replaced) under my projects folder: C:\Tomcat\webapps\myapp\WEB-INF\classes\myappname\*.class - the Servlet stops working throwing this exception: "HTTP Status 503 - This application is not currently available" - just upgraded from Tomcat 4 which did not have this issue, I heard hot-swap is not available anymore on Tomcat if that would be true how could it be possible to drop such a killer feature, how can I do regular updates on my application if I have to end everybody's session all the time, users will kill me, not to talk about my boss. - Thank you so much for your help Paul -- 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 44835] Servlet becomes unavailable if any class is updated during runtime.
https://issues.apache.org/bugzilla/show_bug.cgi?id=44835 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-17 11:44:08 PST --- Bugzilla is not a support forum. This question is best directed to 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44835] Servlet becomes unavailable if any class is updated during runtime.
https://issues.apache.org/bugzilla/show_bug.cgi?id=44835 Paul <[EMAIL PROTECTED]> changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Comment #2 from Paul <[EMAIL PROTECTED]> 2008-04-17 11:56:28 PST --- (In reply to comment #1) > Bugzilla is not a support forum. This question is best directed to the users > list. I thought that the fact that it is throwing exceptions when it did not use to do on previous versions would be a 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]
DO NOT REPLY [Bug 44835] Servlet becomes unavailable if any class is updated during runtime.
https://issues.apache.org/bugzilla/show_bug.cgi?id=44835 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||INVALID -- 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 44835] Servlet becomes unavailable if any class is updated during runtime.
https://issues.apache.org/bugzilla/show_bug.cgi?id=44835 --- Comment #3 from Paul <[EMAIL PROTECTED]> 2008-04-17 12:07:02 PST --- (In reply to comment #1) > Bugzilla is not a support forum. This question is best directed to the users > list. what's going on here? -- 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 44818] tomcat hangs with GET when content-length is defined
https://issues.apache.org/bugzilla/show_bug.cgi?id=44818 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Severity|normal |enhancement --- Comment #5 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-17 12:08:54 PST --- It is one thread per request and it is up to the app to read the content. As Remy said, an option could be added to do this by default. -- 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 44785] Documentation f the MaxThread default value for AJP connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=44785 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-17 12:11:50 PST --- The patch has been applied to 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]
DO NOT REPLY [Bug 44819] SEVERE: Error filterStart
https://issues.apache.org/bugzilla/show_bug.cgi?id=44819 Mark Thomas <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-17 12:15:12 PST --- Bugzilla is not a support forum. Please use 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649238 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Author: fhanik
Date: Thu Apr 17 12:20:00 2008
New Revision: 649238
URL: http://svn.apache.org/viewvc?rev=649238&view=rev
Log:
fix override of methods from standardsession
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=649238&r1=649237&r2=649238&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Thu Apr
17 12:20:00 2008
@@ -22,6 +22,8 @@
import java.io.NotSerializableException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.security.Principal;
import java.util.ArrayList;
@@ -446,6 +448,10 @@
* @exception IOException
*if an input/output error occurs
*/
+@Override
+public void readObjectData(ObjectInputStream stream) throws
ClassNotFoundException, IOException {
+readObject((ObjectInput)stream);
+}
public void readObjectData(ObjectInput stream) throws
ClassNotFoundException, IOException {
readObject(stream);
}
@@ -461,6 +467,10 @@
* @exception IOException
*if an input/output error occurs
*/
+@Override
+public void writeObjectData(ObjectOutputStream stream) throws IOException {
+writeObjectData((ObjectOutput)stream);
+}
public void writeObjectData(ObjectOutput stream) throws IOException {
writeObject(stream);
}
@@ -578,6 +588,11 @@
* @exception IOException
*if an input/output error occurs
*/
+@Override
+protected void readObject(ObjectInputStream stream) throws
ClassNotFoundException, IOException {
+readObject((ObjectInput)stream);
+}
+
private void readObject(ObjectInput stream) throws ClassNotFoundException,
IOException {
// Deserialize the scalar instance variables (except Manager)
@@ -654,6 +669,10 @@
* @exception IOException
*if an input/output error occurs
*/
+protected void writeObject(ObjectOutputStream stream) throws IOException {
+writeObject((ObjectOutput)stream);
+}
+
private void writeObject(ObjectOutput stream) throws IOException {
// Write the scalar instance variables (except Manager)
stream.writeObject(new Long(creationTime));
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44833] DeltaSession Externalization Problem
https://issues.apache.org/bugzilla/show_bug.cgi?id=44833 Filip Hanik <[EMAIL PROTECTED]> changed: What|Removed |Added Status|NEW |ASSIGNED --- Comment #1 from Filip Hanik <[EMAIL PROTECTED]> 2008-04-17 12:18:49 PST --- Fixed in trunk, backport to 6.0.x has been proposed. http://svn.apache.org/viewvc?view=rev&revision=649238 -- 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: r649241 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Thu Apr 17 12:22:19 2008 New Revision: 649241 URL: http://svn.apache.org/viewvc?rev=649241&view=rev Log: override fix for serialized sessions 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=649241&r1=649240&r2=649241&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 12:22:19 2008 @@ -64,3 +64,10 @@ http://svn.apache.org/viewvc?view=rev&revision=645428 +1: jfclere, rjung, fhanik, remm -1: + +* Correctly override methods + Fixes: https://issues.apache.org/bugzilla/show_bug.cgi?id=44833 + http://svn.apache.org/viewvc?view=rev&revision=649238 + +1: fhanik + -1: + \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649248 - /tomcat/trunk/webapps/docs/changelog.xml
Author: fhanik Date: Thu Apr 17 12:46:23 2008 New Revision: 649248 URL: http://svn.apache.org/viewvc?rev=649248&view=rev Log: update changelog Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=649248&r1=649247&r2=649248&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 17 12:46:23 2008 @@ -33,6 +33,14 @@ + + + + 64923844833 + Properly override methods from DeltaSession -> StandardSession + + + 644858 @@ -43,6 +51,9 @@ + 645184 + Properly deserialize Proxy classes + 634513 630533 Cookies are parsed according to both servlet spec and cookie spec if STRICT_SERVLET_COMPLIANCE is set to - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649252 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Author: fhanik
Date: Thu Apr 17 12:58:51 2008
New Revision: 649252
URL: http://svn.apache.org/viewvc?rev=649252&view=rev
Log:
make the alwaysSend flag public, so that we can set it through config
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=649252&r1=649251&r2=649252&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Thu Apr 17 12:58:51 2008
@@ -198,5 +198,13 @@
return link;
}
+public boolean isAlwaysSend() {
+return alwaysSend;
+}
+
+public void setAlwaysSend(boolean alwaysSend) {
+this.alwaysSend = alwaysSend;
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649253 - /tomcat/trunk/webapps/docs/changelog.xml
Author: fhanik Date: Thu Apr 17 13:00:10 2008 New Revision: 649253 URL: http://svn.apache.org/viewvc?rev=649253&view=rev Log: update changelog Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=649253&r1=649252&r2=649253&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Apr 17 13:00:10 2008 @@ -36,6 +36,9 @@ + 649252 + Expose the alwaysSend flag to be able to configure send behavior when reaching the limit + 64923844833 Properly override methods from DeltaSession -> StandardSession - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649254 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Thu Apr 17 13:01:37 2008 New Revision: 649254 URL: http://svn.apache.org/viewvc?rev=649254&view=rev Log: expose property attribute 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=649254&r1=649253&r2=649254&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 13:01:37 2008 @@ -70,4 +70,8 @@ http://svn.apache.org/viewvc?view=rev&revision=649238 +1: fhanik -1: - \ No newline at end of file + +* Expose always send flag for configuration + http://svn.apache.org/viewvc?view=rev&revision=649252 + +1: fhanik + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649264 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 17 13:33:08 2008 New Revision: 649264 URL: http://svn.apache.org/viewvc?rev=649264&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=649264&r1=649263&r2=649264&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 13:33:08 2008 @@ -68,10 +68,10 @@ * Correctly override methods Fixes: https://issues.apache.org/bugzilla/show_bug.cgi?id=44833 http://svn.apache.org/viewvc?view=rev&revision=649238 - +1: fhanik + +1: fhanik, markt -1: * Expose always send flag for configuration http://svn.apache.org/viewvc?view=rev&revision=649252 - +1: fhanik + +1: fhanik, markt -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649302 - /tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
Author: markt
Date: Thu Apr 17 15:07:38 2008
New Revision: 649302
URL: http://svn.apache.org/viewvc?rev=649302&view=rev
Log:
Patch for bug 43683. It could be more efficient if wrapper.started was visible
but that would have made the patch quite invasive.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=649302&r1=649301&r2=649302&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java Thu
Apr 17 15:07:38 2008
@@ -136,6 +136,13 @@
// Select the Wrapper to be used for this Request
Wrapper wrapper = request.getWrapper();
+
+if (wrapper.isUnavailable()) {
+// May be as a result of a reload
+// Try and find the new wrapper
+wrapper = (Wrapper) container.findChild(wrapper.getName());
+}
+
if (wrapper == null) {
String requestURI = request.getDecodedRequestURI();
notFound(requestURI, response);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 43683] Accessing Servlet while Reloading context gives 404 error
https://issues.apache.org/bugzilla/show_bug.cgi?id=43683 --- Comment #5 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-17 15:05:32 PST --- Thanks for the test case. The problem was that the wrapper originally allocated to the request is stopped as part of the reload. I have committed a fix to trunk and proposed it for 6.0.x. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r649303 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Apr 17 15:09:44 2008 New Revision: 649303 URL: http://svn.apache.org/viewvc?rev=649303&view=rev Log: Propose patch. 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=649303&r1=649302&r2=649303&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 15:09:44 2008 @@ -75,3 +75,9 @@ http://svn.apache.org/viewvc?view=rev&revision=649252 +1: fhanik, markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43683 + Need to identify new wrapper for queued request after reload + http://svn.apache.org/viewvc?rev=649302&view=rev + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 44835] Servlet becomes unavailable if any class is updated during runtime.
https://issues.apache.org/bugzilla/show_bug.cgi?id=44835 --- Comment #4 from Mark Thomas <[EMAIL PROTECTED]> 2008-04-17 23:45:55 PST --- What is going on is that you are being directed to the correct forum to ask your question. See http://tomcat.apache.org/lists.html for details of how to subscribe to 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
