svn commit: r411537 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2006-06-04 Thread mturk
Author: mturk
Date: Sun Jun  4 01:42:54 2006
New Revision: 411537

URL: http://svn.apache.org/viewvc?rev=411537&view=rev
Log:
1. Use close instead of shutdown when recycling
   cache slots. The connection does not have any
   pending data in that case.
2. Implement the mincache (it was always 1).

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=411537&r1=411536&r2=411537&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sun Jun  4 
01:42:54 2006
@@ -692,15 +692,14 @@
 return JK_TRUE;
 }
 
-
 /*
- * Reset the endpoint (clean buf)
+ * Reset the endpoint (clean buf and close socket)
  */
 
 static void ajp_reset_endpoint(ajp_endpoint_t * ae, jk_logger_t *l)
 {
 if (ae->sd > 0 && !ae->reuse) {
-jk_shutdown_socket(ae->sd);
+jk_close_socket(ae->sd);
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
"reset socket with sd = %d", ae->sd);
@@ -710,7 +709,7 @@
 }
 
 /*
- * Close the endpoint (clean buf and close socket)
+ * Close the endpoint (close pool and close socket)
  */
 
 void ajp_close_endpoint(ajp_endpoint_t * ae, jk_logger_t *l)
@@ -1857,8 +1856,8 @@
 }
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-"setting connection cache size to %d",
-p->ep_cache_sz);
+"setting connection cache size to %u with min %u",
+p->ep_cache_sz, p->ep_mincache_sz);
 for (i = 0; i < p->ep_cache_sz; i++) {
 p->ep_cache[i] = (ajp_endpoint_t *)calloc(1, 
sizeof(ajp_endpoint_t));
 if (!p->ep_cache[i]) {
@@ -1899,6 +1898,8 @@
 if (pThis && pThis->worker_private) {
 ajp_worker_t *p = pThis->worker_private;
 p->ep_cache_sz = jk_get_worker_cache_size(props, p->name, cache);
+p->ep_mincache_sz = jk_get_worker_cache_size_min(props, p->name,
+ cache / 2);
 p->socket_timeout =
 jk_get_worker_socket_timeout(props, p->name, 
AJP_DEF_SOCKET_TIMEOUT);
 
@@ -1989,7 +1990,6 @@
  */
 
 p->secret = jk_get_worker_secret(props, p->name);
-p->ep_mincache_sz = 1;
 /* Initialize cache slots */
 JK_INIT_CS(&(p->cs), rc);
 if (!rc) {
@@ -2001,7 +2001,7 @@
 }
 if (!ajp_create_endpoint_cache(p, proto, l)) {
 jk_log(l, JK_LOG_ERROR,
-   "allocating ep_cache of size %d",
+   "allocating ep_cache of size %u",
p->ep_cache_sz);
 JK_TRACE_EXIT(l);
 return JK_FALSE;
@@ -2026,7 +2026,7 @@
 
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "up to %d endpoints to close",
+   "up to %u endpoints to close",
aw->ep_cache_sz);
 
 for (i = 0; i < aw->ep_cache_sz; i++) {
@@ -2088,7 +2088,7 @@
 if (i >= 0) {
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-"recycling connection cache slot=%d for worker %s",
+"recycling connection cache slot=%u for worker %s",
 i, p->worker->name);
 JK_TRACE_EXIT(l);
 return JK_TRUE;
@@ -2097,14 +2097,14 @@
  * there is always free empty cache slot
  */
 jk_log(l, JK_LOG_ERROR,
-"could not find empty cache slot from %d for worker %s",
+"could not find empty cache slot from %u for worker %s",
 w->ep_cache_sz, w->name);
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
 
 jk_log(l, JK_LOG_ERROR,
-   "Could not lock mutex errno=%d", errno);
+   "locking thread with errno=%d", errno);
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
@@ -2145,14 +2145,14 @@
 JK_LEAVE_CS(&aw->cs, rc);
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "acquired connection cache slot=%d",
+   "acquired connection cache slot=%u",
slot);
 JK_TRACE_EXIT(l);
 return JK_TRUE;
 }
 else {
 jk_log(l, JK_LOG_WARNING,
-"Unable to get the free endpoint for worker %s from %d 
slots",
+"Unable to get the free endpoint for worker %s from %u 
slots",
 aw->name, aw->ep_cache_sz);
 }
 JK_LEAVE_CS

svn commit: r411538 - /tomcat/connectors/trunk/jk/native/common/jk_map.c

2006-06-04 Thread mturk
Author: mturk
Date: Sun Jun  4 01:43:48 2006
New Revision: 411538

URL: http://svn.apache.org/viewvc?rev=411538&view=rev
Log:
Add checking for deprecated directives.
This is TODO, because we would need to pass the
logger to jk_map functions.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_map.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?rev=411538&r1=411537&r2=411538&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Sun Jun  4 01:43:48 2006
@@ -382,6 +382,12 @@
 v = tmpv;
 }
 else {
+if (jk_is_deprecated_property(prp)) {
+/* TODO: Log deprecated directive.
+ * It would require to pass the jk_log_t
+ * to jk_map_ functions.
+ */
+}
 v = jk_pool_strdup(&m->p, v);
 }
 if (v) {
@@ -421,7 +427,7 @@
 while (NULL != (prp = fgets(buf, LENGTH_OF_LINE, fp))) {
 trim_prp_comment(prp);
 if (*prp) {
-if ((rc =jk_map_read_property(m, prp)) == JK_FALSE)
+if ((rc = jk_map_read_property(m, prp)) == JK_FALSE)
 break;
 }
 }



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r411539 - in /tomcat/connectors/trunk/jk/native/common: jk_util.c jk_util.h

2006-06-04 Thread mturk
Author: mturk
Date: Sun Jun  4 01:44:19 2006
New Revision: 411539

URL: http://svn.apache.org/viewvc?rev=411539&view=rev
Log:
Add connection_min_poll_size directive.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/native/common/jk_util.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?rev=411539&r1=411538&r2=411539&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Jun  4 01:44:19 2006
@@ -48,6 +48,7 @@
 #define TYPE_OF_WORKER  ("type")
 #define CACHE_OF_WORKER_DEPRECATED  ("cachesize")
 #define CACHE_OF_WORKER ("connection_pool_size")
+#define CACHE_OF_WORKER_MIN ("connection_min_pool_size")
 #define CACHE_TIMEOUT_OF_WORKER ("cache_timeout")
 #define RECOVERY_OPTS_OF_WORKER ("recovery_options")
 #define CONNECT_TIMEOUT_OF_WORKER   ("connect_timeout")
@@ -525,6 +526,18 @@
 return jk_map_get_int(m, buf, def);
 }
 
+int jk_get_worker_cache_size_min(jk_map_t *m, const char *wname, int def)
+{
+char buf[1024];
+
+if (!m || !wname) {
+return -1;
+}
+
+MAKE_WORKER_PARAM(CACHE_OF_WORKER_MIN);
+return jk_map_get_int(m, buf, def);
+}
+
 int jk_get_worker_socket_timeout(jk_map_t *m, const char *wname, int def)
 {
 char buf[1024];
@@ -1069,6 +1082,8 @@
 TYPE_OF_WORKER,
 CACHE_OF_WORKER,
 CACHE_OF_WORKER_DEPRECATED,
+CACHE_OF_WORKER,
+CACHE_OF_WORKER_MIN,
 CACHE_TIMEOUT_OF_WORKER,
 RECOVERY_OPTS_OF_WORKER,
 CONNECT_TIMEOUT_OF_WORKER,
@@ -1094,9 +1109,33 @@
 NULL
 };
 
+static const char *deprecated_properties[] = {
+CACHE_OF_WORKER_DEPRECATED,
+MX_OF_WORKER,
+MS_OF_WORKER,
+CP_OF_WORKER,
+BRIDGE_OF_WORKER,
+JVM_OF_WORKER,
+LIBPATH_OF_WORKER,
+CMD_LINE_OF_WORKER,
+NATIVE_LIB_OF_WORKER,
+NULL
+};
+
 int jk_is_unique_property(const char *prp_name)
 {
 const char **props = &unique_properties[0];
+while (*props) {
+if (jk_is_some_property(prp_name, *props))
+return JK_TRUE;
+props++;
+}
+return JK_FALSE;
+}
+
+int jk_is_deprecated_property(const char *prp_name)
+{
+const char **props = &deprecated_properties[0];
 while (*props) {
 if (jk_is_some_property(prp_name, *props))
 return JK_TRUE;

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?rev=411539&r1=411538&r2=411539&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Sun Jun  4 01:44:19 2006
@@ -55,6 +55,8 @@
 
 int jk_get_worker_cache_size(jk_map_t *m, const char *wname, int def);
 
+int jk_get_worker_cache_size_min(jk_map_t *m, const char *wname, int def);
+
 int jk_get_worker_socket_timeout(jk_map_t *m, const char *wname, int def);
 
 int jk_get_worker_socket_buffer(jk_map_t *m, const char *wname, int def);
@@ -136,6 +138,8 @@
 int jk_is_cmd_line_poperty(const char *prp_name);
 
 int jk_is_unique_property(const char *prp_name);
+
+int jk_is_deprecated_property(const char *prp_name);
 
 int jk_get_worker_stdout(jk_map_t *m, const char *wname, const char 
**stdout_name);
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r411541 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp_common.c jk_ajp_common.h jk_util.c

2006-06-04 Thread mturk
Author: mturk
Date: Sun Jun  4 02:12:17 2006
New Revision: 411541

URL: http://svn.apache.org/viewvc?rev=411541&view=rev
Log:
Deprecate recycle_timeout. It purpose was
the same as cache_timeout. Also, to be consistent
log every cache related thing as connection pool.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h
tomcat/connectors/trunk/jk/native/common/jk_util.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=411541&r1=411540&r2=411541&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sun Jun  4 
02:12:17 2006
@@ -866,7 +866,7 @@
jk_dump_hinfo(&ae->worker->worker_inet_addr, buf));
 }
 /* set last_access only if needed */
-if (ae->worker->cache_timeout > 0 || ae->worker->recycle_timeout > 0)
+if (ae->worker->cache_timeout > 0)
 ae->last_access = time(NULL);
 /* Check if we must execute a logon after the physical connect */
 if (ae->worker->logon != NULL) {
@@ -1856,13 +1856,13 @@
 }
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-"setting connection cache size to %u with min %u",
+"setting connection pool size to %u with min %u",
 p->ep_cache_sz, p->ep_mincache_sz);
 for (i = 0; i < p->ep_cache_sz; i++) {
 p->ep_cache[i] = (ajp_endpoint_t *)calloc(1, 
sizeof(ajp_endpoint_t));
 if (!p->ep_cache[i]) {
 jk_log(l, JK_LOG_ERROR,
-"creating endpont cache slot %d errno=%d",
+"creating endpont pool slot %d errno=%d",
 i, errno);
 JK_TRACE_EXIT(l);
 return JK_FALSE;
@@ -1913,9 +1913,6 @@
"setting socket keepalive to %d",
p->keepalive);
 
-p->recycle_timeout =
-jk_get_worker_recycle_timeout(props, p->name, AJP13_DEF_TIMEOUT);
-
 p->cache_timeout =
 jk_get_worker_cache_timeout(props, p->name,
 AJP_DEF_CACHE_TIMEOUT);
@@ -1957,11 +1954,7 @@
p->socket_buf);
 
 jk_log(l, JK_LOG_DEBUG,
-   "setting connection recycle timeout to %d",
-   p->recycle_timeout);
-
-jk_log(l, JK_LOG_DEBUG,
-   "setting cache timeout to %d",
+   "setting connection pool timeout to %d",
p->cache_timeout);
 
 jk_log(l, JK_LOG_DEBUG,
@@ -2001,7 +1994,7 @@
 }
 if (!ajp_create_endpoint_cache(p, proto, l)) {
 jk_log(l, JK_LOG_ERROR,
-   "allocating ep_cache of size %u",
+   "allocating connection pool of size %u",
p->ep_cache_sz);
 JK_TRACE_EXIT(l);
 return JK_FALSE;
@@ -2080,7 +2073,7 @@
 ajp_reset_endpoint(p, l);
 *e = NULL;
 /* set last_access only if needed */
-if (w->cache_timeout > 0 || w->recycle_timeout > 0)
+if (w->cache_timeout > 0)
 p->last_access = time(NULL);
 JK_LEAVE_CS(&w->cs, rc);
 if (sock >= 0)
@@ -2088,7 +2081,7 @@
 if (i >= 0) {
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-"recycling connection cache slot=%u for worker %s",
+"recycling connection pool slot=%u for worker %s",
 i, p->worker->name);
 JK_TRACE_EXIT(l);
 return JK_TRUE;
@@ -2097,7 +2090,7 @@
  * there is always free empty cache slot
  */
 jk_log(l, JK_LOG_ERROR,
-"could not find empty cache slot from %u for worker %s",
+"could not find empty connection pool slot from %u for 
worker %s",
 w->ep_cache_sz, w->name);
 JK_TRACE_EXIT(l);
 return JK_FALSE;
@@ -2125,7 +2118,7 @@
 time_t now = 0;
 int rc;
 /* Obtain current time only if needed */
-if (aw->cache_timeout > 0 || aw->recycle_timeout > 0)
+if (aw->cache_timeout > 0)
 now = time(NULL);
 *je = NULL;
 
@@ -2145,7 +2138,7 @@
 JK_LEAVE_CS(&aw->cs, rc);
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "acquired connection cache slot=%u",
+   "acquired connection pool slot=%u",
slot);
 JK_TRACE_EXIT(l);

svn commit: r411543 - in /tomcat/connectors/trunk/jk/xdocs: changelog.xml config/workers.xml

2006-06-04 Thread mturk
Author: mturk
Date: Sun Jun  4 02:32:30 2006
New Revision: 411543

URL: http://svn.apache.org/viewvc?rev=411543&view=rev
Log:
Update the docs with recent changes.

Modified:
tomcat/connectors/trunk/jk/xdocs/changelog.xml
tomcat/connectors/trunk/jk/xdocs/config/workers.xml

Modified: tomcat/connectors/trunk/jk/xdocs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/changelog.xml?rev=411543&r1=411542&r2=411543&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/changelog.xml Sun Jun  4 02:32:30 2006
@@ -25,6 +25,15 @@
   
   
 
+  
+  Renamed cache_timeout firective to connection_pool_timeout. (mturk)
+  
+  
+  Added connection_pool_minsize directive. (mturk)
+  
+  
+  Deprecate recycle_timeout directive. (mturk)
+  
   
   37469: Fix shared memory close for forked childs.
   The shared memory will be closed by the parent process. (mturk)

Modified: tomcat/connectors/trunk/jk/xdocs/config/workers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/workers.xml?rev=411543&r1=411542&r2=411543&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/workers.xml Sun Jun  4 02:32:30 2006
@@ -132,8 +132,8 @@
 This directive should be used when you have a firewall between your webserver
 and the Tomcat engine, who tend to drop inactive connections. This flag will 
told Operating System
 to send KEEP_ALIVE message on inactive connections (interval 
depend on global OS settings,
-generally 120ms), and thus prevent the firewall to cut the connection.
-To enable keepalive set this property value to the number greater then 
0.
+generally 120 minutes), and thus prevent the firewall to cut the connection.
+To enable keepalive set this property value to the True.
 
 The problem with Firewall cutting inactive connections is that sometimes, 
neither webserver or tomcat
 have information about the cut and couldn't handle it.
@@ -141,13 +141,7 @@
 
 
 
-The number of seconds that told webserver to cut an ajp13 connection after 
some time of
-inactivity. When choosing an endpoint for a request and the assigned socket is 
open, it will be
-closed if it was not used for the configured time.
-It's a good way to ensure that there won't too old threads living on Tomcat 
side,
-with the extra cost you need to reopen the socket next time a request be 
forwarded.
-This property is very similar to cache_timeout but works also in 
non-cache mode.
-If set to value zero (default) no recycle will took place.
+This directive has been deprecated since 1.2.16. See Connection 
Poll directives instead
 
 
 
@@ -157,12 +151,16 @@
 
 
 
-Cachesize defines the number of connections made to the AJP backend that
+This directive has been deprecated since 1.2.16. See 
connection_pool_size instead
+
+
+
+This defines the number of connections made to the AJP backend that
 are maintained as a connection pool.
 It will limit the number of those connection that each web server child
 process can made.
 
-Cachesize property is used only for multi threaded
+Connection pool size property is used only for multi threaded
 web servers such as Apache 2.0 (worker), IIS and Netscape. The cachesize 
property
 should reflect the number of threads per child process. JK will discover
 the number of threads per child process on Apache 2 web server with worker-mpm 
and set
@@ -172,9 +170,21 @@
 Do not use cachesize with values higher then 1 on Apache 2.x 
prefork or Apache 1.3.x!
 
 
-
-Cache timeout property should be used with cachesize to specify how to 
time JK should keep
-an open socket in cache before closing it. This property should be used to 
reduce the number of threads
+
+Minimum size of the connection pool that will be maintained.
+
+This property is used only when the connection_pool_size is specified.
+Its default value is connection_pool_size/2.
+
+Do not use connection_pool_size with values higher then 1 on Apache 
2.x prefork or Apache 1.3.x!
+
+This feature has been added in jk 1.2.16.
+
+
+
+
+Cache timeout property should be used with connection_pool_size to 
specify how long JK should keep
+an incative socket in cache before closing it. This property should be used to 
reduce the number of threads
 on the Tomcat WebServer.
 
 Each child could open an ajp13 connection if it have to forward a request to 
Tomcat, creating
@@ -186,6 +196,10 @@
 to handle high-load, even it the child/thread handle only static contents, you 
could
 finish having many unused ajp13 threads on the Tomcat side.
 .
+
+
+
+This directive has been deprecated since 1.2.16. See 
connection_pool_timeout instead
 
 
 



-
T

svn commit: r411544 - /tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc

2006-06-04 Thread mturk
Author: mturk
Date: Sun Jun  4 02:38:24 2006
New Revision: 411544

URL: http://svn.apache.org/viewvc?rev=411544&view=rev
Log:
Prepare the version for release.

Modified:
tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc

Modified: tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc?rev=411544&r1=411543&r2=411544&view=diff
==
--- tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc (original)
+++ tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc Sun Jun  4 02:38:24 
2006
@@ -1,4 +1,4 @@
-#define JK_COPYRIGHT "Copyright 2000-2005 The Apache Software " \
+#define JK_COPYRIGHT "Copyright 2000-2006 The Apache Software " \
  "Foundation or its licensors, as applicable."
 
 #define JK_LICENSE "Licensed under the Apache License, Version 2.0 " \
@@ -14,7 +14,7 @@
 "specific language governing permissions and " \
 "limitations under the License."
 
-#define JK_VERSION_STR  "1.2.16-dev"
+#define JK_VERSION_STR  "1.2.16"
 #define JK_DLL_BASENAME "isapi_redirect-" JK_VERSION_STR
 
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r411550 - in /tomcat/connectors/trunk/jni/native/os/win32: ntpipe.c registry.c system.c

2006-06-04 Thread mturk
Author: mturk
Date: Sun Jun  4 05:06:09 2006
New Revision: 411550

URL: http://svn.apache.org/viewvc?rev=411550&view=rev
Log:
Use includes so that APR with IPV6 does not throw errors.

Modified:
tomcat/connectors/trunk/jni/native/os/win32/ntpipe.c
tomcat/connectors/trunk/jni/native/os/win32/registry.c
tomcat/connectors/trunk/jni/native/os/win32/system.c

Modified: tomcat/connectors/trunk/jni/native/os/win32/ntpipe.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/os/win32/ntpipe.c?rev=411550&r1=411549&r2=411550&view=diff
==
--- tomcat/connectors/trunk/jni/native/os/win32/ntpipe.c (original)
+++ tomcat/connectors/trunk/jni/native/os/win32/ntpipe.c Sun Jun  4 05:06:09 
2006
@@ -24,8 +24,9 @@
 #define _WIN32_WINNT 0x0500
 #endif
 #define STRICT
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 
 #include "tcn.h"

Modified: tomcat/connectors/trunk/jni/native/os/win32/registry.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/os/win32/registry.c?rev=411550&r1=411549&r2=411550&view=diff
==
--- tomcat/connectors/trunk/jni/native/os/win32/registry.c (original)
+++ tomcat/connectors/trunk/jni/native/os/win32/registry.c Sun Jun  4 05:06:09 
2006
@@ -22,7 +22,9 @@
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0500
 #endif
-#include 
+#include 
+#include 
+#include 
 #include 
 
 #include "apr.h"

Modified: tomcat/connectors/trunk/jni/native/os/win32/system.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/os/win32/system.c?rev=411550&r1=411549&r2=411550&view=diff
==
--- tomcat/connectors/trunk/jni/native/os/win32/system.c (original)
+++ tomcat/connectors/trunk/jni/native/os/win32/system.c Sun Jun  4 05:06:09 
2006
@@ -22,8 +22,9 @@
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0500
 #endif
-#include 
-#include 
+#include 
+#include 
+#include 
 #include "apr.h"
 #include "apr_pools.h"
 #include "apr_poll.h"



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r411551 - in /tomcat/connectors/trunk/jk/xdocs/news: 20041100.xml 20050101.xml 20060505.xml project.xml

2006-06-04 Thread mturk
Author: mturk
Date: Sun Jun  4 05:30:37 2006
New Revision: 411551

URL: http://svn.apache.org/viewvc?rev=411551&view=rev
Log:
Update news docs by adding year 2006 item.

Added:
tomcat/connectors/trunk/jk/xdocs/news/20060505.xml
Modified:
tomcat/connectors/trunk/jk/xdocs/news/20041100.xml
tomcat/connectors/trunk/jk/xdocs/news/20050101.xml
tomcat/connectors/trunk/jk/xdocs/news/project.xml

Modified: tomcat/connectors/trunk/jk/xdocs/news/20041100.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20041100.xml?rev=411551&r1=411550&r2=411551&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/news/20041100.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/20041100.xml Sun Jun  4 05:30:37 2006
@@ -7,7 +7,7 @@
   &project;
  
   
-Apache Jakarta 
Project
+Apache Jakarta 
Project
 2004 News and Status
   
 

Modified: tomcat/connectors/trunk/jk/xdocs/news/20050101.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20050101.xml?rev=411551&r1=411550&r2=411551&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/news/20050101.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/20050101.xml Sun Jun  4 05:30:37 2006
@@ -2,12 +2,12 @@
 
 ]>
-
+
  
   &project;
  
   
-Apache Jakarta 
Project
+Apache Jakarta 
Project
 2005 News and Status
   
 

Added: tomcat/connectors/trunk/jk/xdocs/news/20060505.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20060505.xml?rev=411551&view=auto
==
--- tomcat/connectors/trunk/jk/xdocs/news/20060505.xml (added)
+++ tomcat/connectors/trunk/jk/xdocs/news/20060505.xml Sun Jun  4 05:30:37 2006
@@ -0,0 +1,42 @@
+
+
+]>
+
+ 
+  &project;
+ 
+  
+Apache Tomcat 
Connectors Project
+2006 News and Status
+  
+
+
+
+
+
+
+ 
+6 June - JK-1.2.16 released
+The Apache Tomcat team is proud to announce the immediate availability
+of Jakarta Tomcat Connectors 1.2.16. This is Stable release and it contains
+few bug fixes found in 1.2.16 version.
+
+
+ Please see the ChangeLog for a full list of 
changes.
+
+If you find any bugs while using this release, please fill in the
+http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla
+Bug Report. When entering bug select Native:JK Component.
+
+
+
+
+
+
+  

Modified: tomcat/connectors/trunk/jk/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/project.xml?rev=411551&r1=411550&r2=411551&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/news/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/project.xml Sun Jun  4 05:30:37 2006
@@ -1,8 +1,8 @@
 
-http://jakarta.apache.org/tomcat/";>
+http://tomcat.apache.org/connector-docs/";>
 
-Jakarta Tomcat Connector
+Apache Tomcat Connector
 
 
 Breaking News
@@ -11,6 +11,9 @@
 
 
 
+
+
+
 
 
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r411576 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11: InternalAprInputBuffer.java InternalAprOutputBuffer.java

2006-06-04 Thread remm
Author: remm
Date: Sun Jun  4 08:01:39 2006
New Revision: 411576

URL: http://svn.apache.org/viewvc?rev=411576&view=rev
Log:
- With Comet support, it is necessary to optimize the amount of memory used by 
individual
  processors. This removes most of the buffers that are being used, without 
reducing performance
  in many cases.
- Note: I'm not sure the algorithm in InternalAprInputBuffer.nextRequest, which 
is used when
  pipelining, is correct. It also could use free space in the buffer more 
efficiently when trimming 
  it.

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=411576&r1=411575&r2=411576&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java 
Sun Jun  4 08:01:39 2006
@@ -55,14 +55,12 @@
 this.request = request;
 headers = request.getMimeHeaders();
 
-headerBuffer1 = new byte[headerBufferSize];
-headerBuffer2 = new byte[headerBufferSize];
-bodyBuffer = new byte[headerBufferSize];
-buf = headerBuffer1;
-bbuf = ByteBuffer.allocateDirect(headerBufferSize);
-
-headerBuffer = new char[headerBufferSize];
-ascbuf = headerBuffer;
+buf = new byte[headerBufferSize];
+if (headerBufferSize < (8 * 1024)) {
+bbuf = ByteBuffer.allocateDirect(6 * 1500);
+} else {
+bbuf = ByteBuffer.allocateDirect((headerBufferSize / 1500 + 1) * 
1500);
+}
 
 inputStreamInputBuffer = new SocketInputBuffer();
 
@@ -126,12 +124,6 @@
 
 
 /**
- * Pointer to the US-ASCII header buffer.
- */
-protected char[] ascbuf;
-
-
-/**
  * Last valid byte.
  */
 protected int lastValid;
@@ -144,27 +136,10 @@
 
 
 /**
- * HTTP header buffer no 1.
- */
-protected byte[] headerBuffer1;
-
-
-/**
- * HTTP header buffer no 2.
- */
-protected byte[] headerBuffer2;
-
-
-/**
- * HTTP body buffer.
+ * Pos of the end of the header in the buffer, which is also the
+ * start of the body.
  */
-protected byte[] bodyBuffer;
-
-
-/**
- * US-ASCII header buffer.
- */
-protected char[] headerBuffer;
+protected int end;
 
 
 /**
@@ -313,7 +288,6 @@
 request.recycle();
 
 socket = 0;
-buf = headerBuffer1;
 lastValid = 0;
 pos = 0;
 lastActiveFilter = -1;
@@ -334,20 +308,19 @@
 // Recycle Request object
 request.recycle();
 
-// Determine the header buffer used for next request
-byte[] newHeaderBuf = null;
-if (buf == headerBuffer1) {
-newHeaderBuf = headerBuffer2;
-} else {
-newHeaderBuf = headerBuffer1;
+//System.out.println("LV-pos: " + (lastValid - pos));
+// Copy leftover bytes to the beginning of the buffer
+if (lastValid - pos > 0) {
+int npos = 0;
+int opos = pos;
+while (lastValid - opos > opos - npos) {
+System.arraycopy(buf, opos, buf, npos, opos - npos);
+npos += pos;
+opos += pos;
+}
+System.arraycopy(buf, opos, buf, npos, lastValid - opos);
 }
-
-// Copy leftover bytes from buf to newHeaderBuf
-System.arraycopy(buf, pos, newHeaderBuf, 0, lastValid - pos);
-
-// Swap buffers
-buf = newHeaderBuf;
-
+
 // Recycle filters
 for (int i = 0; i <= lastActiveFilter; i++) {
 activeFilters[i].recycle();
@@ -479,11 +452,9 @@
 throw new EOFException(sm.getString("iib.eof.error"));
 }
 
-ascbuf[pos] = (char) buf[pos];
-
 if (buf[pos] == Constants.SP) {
 space = true;
-request.method().setChars(ascbuf, start, pos - start);
+request.method().setBytes(buf, start, pos - start);
 }
 
 pos++;
@@ -554,8 +525,6 @@
 throw new EOFException(sm.getString("iib.eof.error"));
 }
 
-ascbuf[pos] = (char) buf[pos];
-
 if (buf[pos] == Constants.CR) {
 end = pos;
 } else if (buf[pos] == Constants.LF) {
@@ -569,7 +538,7 @@
 }
 
 if ((end - start) > 0) {
-request.protocol().setChars(ascbuf, start, end - start);
+request.protocol().setBytes(buf, start, end - start);
 } else {
 request.protocol().setString("");

svn commit: r411577 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java

2006-06-04 Thread remm
Author: remm
Date: Sun Jun  4 08:05:19 2006
New Revision: 411577

URL: http://svn.apache.org/viewvc?rev=411577&view=rev
Log:
- Remove usage of the CharChunk buffer (converters already use buffers). C2B 
converters could most
  likely be optimized (since they should probably rely on the byte chunk that 
they are writing to).
  This does not seem to reduce performance in a noticeable way, but I did not 
benchmark that much.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=411577&r1=411576&r2=411577&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java 
Sun Jun  4 08:05:19 2006
@@ -24,12 +24,10 @@
 import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
 
-import org.apache.catalina.security.SecurityUtil;
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Response;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.C2BConverter;
-import org.apache.tomcat.util.buf.CharChunk;
 
 
 /**
@@ -41,7 +39,7 @@
  * @author Remy Maucherat
  */
 public class OutputBuffer extends Writer
-implements ByteChunk.ByteOutputChannel, CharChunk.CharOutputChannel {
+implements ByteChunk.ByteOutputChannel {
 
 
 // -- Constants
@@ -52,14 +50,6 @@
 public static final int DEFAULT_BUFFER_SIZE = 8*1024;
 
 
-// The buffer can be used for byte[] and char[] writing
-// ( this is needed to support ServletOutputStream and for
-// efficient implementations of templating systems )
-public final int INITIAL_STATE = 0;
-public final int CHAR_STATE = 1;
-public final int BYTE_STATE = 2;
-
-
 // - Instance Variables
 
 
@@ -70,15 +60,9 @@
 
 
 /**
- * The chunk buffer.
- */
-private CharChunk cb;
-
-
-/**
  * State of the output buffer.
  */
-private int state = 0;
+private boolean initial = true;
 
 
 /**
@@ -170,9 +154,6 @@
 bb = new ByteChunk(size);
 bb.setLimit(size);
 bb.setByteOutputChannel(this);
-cb = new CharChunk(size);
-cb.setCharOutputChannel(this);
-cb.setLimit(size);
 
 }
 
@@ -228,11 +209,10 @@
  */
 public void recycle() {
 
-state = INITIAL_STATE;
+initial = true;
 bytesWritten = 0;
 charsWritten = 0;
 
-cb.recycle();
 bb.recycle(); 
 closed = false;
 suspended = false;
@@ -263,11 +243,6 @@
 
 if ((!coyoteResponse.isCommitted()) 
 && (coyoteResponse.getContentLengthLong() == -1)) {
-// Flushing the char buffer
-if (state == CHAR_STATE) {
-cb.flushBuffer();
-state = BYTE_STATE;
-}
 // If this didn't cause a commit of the response, the final content
 // length can be calculated
 if (!coyoteResponse.isCommitted()) {
@@ -306,15 +281,12 @@
 return;
 
 doFlush = true;
-if (state == CHAR_STATE) {
-cb.flushBuffer();
-bb.flushBuffer();
-state = BYTE_STATE;
-} else if (state == BYTE_STATE) {
-bb.flushBuffer();
-} else if (state == INITIAL_STATE) {
-// If the buffers are empty, commit the response header
+if (initial) {
 coyoteResponse.sendHeaders();
+initial = false;
+}
+if (bb.getLength() > 0) {
+bb.flushBuffer();
 }
 doFlush = false;
 
@@ -375,9 +347,6 @@
 if (suspended)
 return;
 
-if (state == CHAR_STATE)
-cb.flushBuffer();
-state = BYTE_STATE;
 writeBytes(b, off, len);
 
 }
@@ -407,11 +376,7 @@
 if (suspended)
 return;
 
-if (state == CHAR_STATE)
-cb.flushBuffer();
-state = BYTE_STATE;
-
-bb.append( (byte)b );
+bb.append((byte) b);
 bytesWritten++;
 
 }
@@ -426,11 +391,10 @@
 if (suspended)
 return;
 
-state = CHAR_STATE;
-
-cb.append((char) c);
+conv.convert((char) c);
+conv.flushBuffer();
 charsWritten++;
-
+
 }
 
 
@@ -451,25 +415,9 @@
 if (suspended)
 return;
 
-state = CHAR_STATE;
-
-cb.append(c, off, len);
-charsWritten += len;
-
-}
-
-
-public void write(StringBuffer sb)
-throws IOException {
-
-if (suspended)
-return;
-
-

Bug report for Tomcat 3 [2006/06/04]

2006-06-04 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt|
| 2478|Opn|Cri|2001-07-06|Passing Session variables between JSP's and Servle|
| 4551|Opn|Nor|2001-10-31|Ctx( /tt01 ): IOException in: R( /tt01 + /com/abc/|
| 4980|New|Min|2001-11-20|Startup message indicates incorrect log file  |
| 4994|New|Nor|2001-11-21|Tomcat needs a mechanism for clean and certain shu|
| 5064|New|Cri|2001-11-25|Socket write error when include files is more than|
| 5108|New|Maj|2001-11-26|Docs for Tomcat 3.2.x appear to be for Tomcat 3.3 |
| 5137|New|Nor|2001-11-27|Null pointer in class loader after attempting to r|
| 5160|Unc|Maj|2001-11-28|'IllegalStateException'   |
| 5331|New|Nor|2001-12-09|getPathInfo vs URL normalization  |
| 5510|New|Blk|2001-12-19|How to call ejb deployed in JBoss from Tomcat serv|
| 5756|New|Nor|2002-01-08|jspc.bat exits with wrong ERRORLEVEL  |
| 5797|New|Nor|2002-01-10|UnCatched ? StringIndexOutOfBoundsException: Strin|
| 6027|New|Maj|2002-01-25|Tomcat  Automatically shuts down as service   |
| 6168|New|Blk|2002-02-01|IllegalStateException |
| 6451|New|Cri|2002-02-14|Stackoverflow |
| 6478|New|Enh|2002-02-14|Default Tomcat Encoding   |
| 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c|
| 6648|New|Nor|2002-02-25|jakarta-servletapi build with java 1.4 javadoc err|
| 6989|New|Maj|2002-03-08|Unable to read tld file during parallel JSP compil|
| 7013|New|Cri|2002-03-10|Entering a servlet path with non-ISO8859-1 charact|
| 7227|New|Nor|2002-03-19| directive don't work |
| 7626|New|Nor|2002-03-29|classloader not working properly  |
| 7652|New|Cri|2002-04-01|Tomcat stalls periodically|
| 7785|New|Blk|2002-04-06|tomcat bug in context reloading   |
| 7863|New|Maj|2002-04-09|I have a problem when running Tomcat with IIS |
| 8187|New|Cri|2002-04-17|Errors when Tomcat used with MS Access database   |
| 8239|New|Cri|2002-04-18|Resource temporary unavailable|
| 8263|New|Cri|2002-04-18|url-pattern easy to circumvent|
| 9250|New|Maj|2002-05-20|outOfMemoryError  |
| 9367|New|Maj|2002-05-23|HttpSessionBindingEvent not thrown for HttpSession|
| 9390|New|Nor|2002-05-24|jasper compilation error in tomcat|
| 9480|New|Nor|2002-05-29|Data connection pooling   |
| 9607|New|Maj|2002-06-04|precompile JSP|
| 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p|
|10047|New|Cri|2002-06-20|IllegalStateException |
|10202|New|Maj|2002-06-25|Tomcat is not responding in time  |
|10357|Unc|Blk|2002-06-30|java.lang.IllegalArgumentException: Short Read|
|10406|New|Cri|2002-07-02|IllegalStateException |
|11087|New|Blk|2002-07-23|IllegalStateException |
|11286|New|Maj|2002-07-30|Tomcat threads not respond if increase JVM size   |
|11466|New|Nor|2002-08-05|ContextManager: SocketException reading request   |
|12156|New|Cri|2002-08-29|Apache and Tomcat 3.3.1 Interworking problem  |
|12194|New|Maj|2002-08-30|Tomcat does not send WWW-Authenticate header  |
|12852|New|Nor|2002-09-20|May be error in _jspService() -> out.flushBuffers(|
|14386|New|Maj|2002-11-08|Date headers corrupted using setDateHeader|
|15632|New|Nor|2002-12-23|Problem with the Tomcat Sessions Parameter on URL |
|16363|New|Cri|2003-01-23|Stack Overflow accessing compiled JSP - Tomcat 3.2|
|17915|New|Maj|2003-03-12|Jasper ignores manifest classpath |
|19114|New|Nor|2003-04-17|RequestDispatcherImpl does not set root cause exce|
|19143|New|Nor|2003-04-18|if TOMCAT_INSTALL differs from TOMCAT_HOME -sequri|
|20238|New|Maj|2003

Bug report for Watchdog [2006/06/04]

2006-06-04 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|  278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug|
|  279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug|
|  469|Unc|Nor|2001-01-17|in example-taglib.tld "urn" should be "uri" BugRat|
|  470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B|
| 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths|
|10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher|
|11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()|
|11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav|
|11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie|
|11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro|
|11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.|
|14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec|
|15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv|
|24649|New|Nor|2003-11-12|getRemoteHost fails when agent has uppercase chara|
|29398|New|Nor|2004-06-04|Update site and note current status   |
+-+---+---+--+--+
| Total   15 bugs   |
+---+

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Bug report for Tomcat 5 [2006/06/04]

2006-06-04 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|17310|Ver|Nor|2003-02-22|;jsessionid confuses StandardHostcan't find Co|
|19803|Ver|Maj|2003-05-09|manager reload fails and disables app - Incompatib|
|19958|Ver|Maj|2003-05-15|Problems reading ServletInputStream   |
|20268|Inf|Min|2003-05-27|Tomcat 5.0.2 takes 100% CPU   |
|21045|Ver|Nor|2003-06-24|Manager app does find resources   |
|21600|Ver|Nor|2003-07-15|'s lost after manager stop/start or rel|
|22679|Ver|Enh|2003-08-24|how to access ssl session ID out of tomcat to prev|
|22986|Ver|Nor|2003-09-08|Web apps with context XML file don't start if CATA|
|24413|Ver|Nor|2003-11-04|bundled JMX implementation not compliant to specif|
|24943|Ver|Nor|2003-11-24|Tomcat 5.0.14 / Windows 2000 Service does not star|
|25078|Ver|Nor|2003-11-29|Catalina Ant Serverinfo task always fails |
|27338|Ver|Maj|2004-03-01|Wrong mappings for JSP Documents (.jspx)  |
|28039|New|Enh|2004-03-30|Cluster Support for SingleSignOn  |
|28634|Ass|Enh|2004-04-27|Extend StandardManager/StandardSession for DeltaMa|
|28709|Ver|Nor|2004-04-30|javax.servlet.http.HttpServletRequest.isRequestedS|
|28875|Ver|Nor|2004-05-10|Multi-byte characters in default error page aren't|
|29091|Opn|Nor|2004-05-19|Non-ascii characters are not handled correctly... |
|29160|Ver|Enh|2004-05-23|precompile problem: _jspx_meth_* (javax.servlet.js|
|29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi|
|29497|Unc|Nor|2004-06-10|Connection pool, redeployment |
|29521|Ver|Cri|2004-06-11|No destroy methods called on service shutdown |
|30155|Opn|Cri|2004-07-16|Problem with viewing mail session |
|30241|Ver|Enh|2004-07-21|Enhance build script to use branch argument when c|
|30489|Opn|Cri|2004-08-05|removeAttribute: Session already invalidated  |
|30833|Ver|Nor|2004-08-24|request.getServerPort() returns wrong port (WAS: r|
|31339|Inf|Maj|2004-09-21|admin app throwing struts exceptions  |
|32180|New|Nor|2004-11-11|EL functions are executed in privileged context   |
|32280|Ver|Cri|2004-11-17|Problem clustering tomcat when a failed server is |
|32569|Ass|Nor|2004-12-07|ServletContextListener will not die   |
|32593|Inf|Maj|2004-12-09|Server (Apache 2.0.48) reached MaxClients setting |
|32754|Inf|Nor|2004-12-17|Can't modify thread configuration attributes of AJ|
|32832|Ver|Maj|2004-12-23|request.getSession(false) fails to return null.   |
|33180|Ver|Nor|2005-01-20|JSTL automatic type conversion gives unexpected re|
|33262|Inf|Nor|2005-01-27|Service Manager autostart should check for adminis|
|33356|Inf|Maj|2005-02-02|Incorrect parsing of tag attributes   |
|33407|Inf|Nor|2005-02-05|\$ is quoted even with el-ignored=true|
|33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps|
|33650|Inf|Enh|2005-02-19|Jasper performance for multiple files processing  |
|33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na|
|33806|Opn|Min|2005-03-02|Session tracking using URL rewriting fails, if cli|
|33831|Ver|Nor|2005-03-03|RequestDispatcher.forward and resource missing|
|34006|Ver|Nor|2005-03-14|Undeploy of webapps with antiResourceLocking in ME|
|34016|Ver|Nor|2005-03-15|antiResourceLocking webapp fails to deploy on Tomc|
|34033|Ver|Nor|2005-03-16|Cannot delete users using Administration Tool weba|
|34076|Inf|Nor|2005-03-18|overriding content.xml docBase with manager webapp|
|34319|New|Nor|2005-04-06|StoreBase.processExpires() is very inefficient|
|34396|Inf|   |2005-04-11|security exception using datasource in|
|35635|New|Nor|2005-07-06|Tomcat service does not log startup error messages|
|35746|Inf|Nor|2005-07-14|session manager should be immune to system clock t|
|35765|New|Enh|2005-07-16|make the SSL cipher config in server.xml fail safe|
|35827|Inf|Blk|2005-07-22|Problem with POST forms with jk connector/IIS/Wind|
|35835|Inf

Bug report for Tomcat 4 [2006/06/04]

2006-06-04 Thread bugzilla
+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 3839|Opn|Enh|2001-09-26|Problem bookmarking login page|
| 4227|Opn|Enh|2001-10-17|Invalid CGI path  |
| 5329|New|Enh|2001-12-08|NT Service exits startup before Tomcat is finished|
| 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob|
| 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi|
| 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio|
| 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI|
| 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam|
| 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty|
| 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store   |
| 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output|
| 7676|New|Enh|2002-04-02|Allow name property to use match experssions in  without className in server.xml produces N|
|11069|Opn|Enh|2002-07-23|Tomcat not flag error if tld is outside of /WEB-IN|
|11129|New|Enh|2002-07-24|New valve for putting the sessionIDs in the reques|
|11248|New|Enh|2002-07-29|DefaultServlet doesn't send expires header|
|11754|Opn|Enh|2002-08-15|Synchronous shutdown script - shutdown.sh should w|
|12069|New|Enh|2002-08-27|Creation of more HttpSession objects for one previ|
|12658|New|Enh|2002-09-15|a proxy host and port at the  element level |
|12766|New|Enh|2002-09-18|Tomcat should use tld files in /WEB-INF/ over vers|
|13309|Opn|Enh|2002-10-04|Catalina calls System.exit()  |
|13634|New|Enh|2002-10-15|Allowing system properties to be substituted in co|
|13689|Opn|Enh|2002-10-16|Classloader paths for 'Common' classes and librari|
|13731|New|Enh|2002-10-17|Final request, response, session and other variabl|
|13941|New|Enh|2002-10-24|reload is VERY slow   |
|13965|New|Enh|2002-10-25|Catalina.sh correction request for Tru64 Unix |
|14097|New|Enh|2002-10-30|hardcoded registry value for vm lets tomcat servic|
|14416|New|Enh|2002-11-10|blank tag name in TLD cause NullPointerException  |
|14635|New|Enh|2002-11-18|Should be possible not to have -MM-DD in log f|
|14766|New|Enh|2002-11-22|Redirect Vavle|
|14993|New|Enh|2002-12-02|Possible obselete synchronized declaration|
|15115|New|Enh|2002-12-05|correct docs... XML parser *cannot* be overridden |
|15417|Opn|Enh|2002-12-16|Add port for forced compilation of JSP pages  |
|15688|New|Enh|2002-12-27|full-qualified names instead of imports   |
|15893|New|Enh|2003-01-08|Need a getPort() method on Connector or similar fu|
|15941|New|Enh|2003-01-10|Expose rootCause exceptions at deeper levels  |
|16294|New|Enh|2003-01-21|Configurable URL Decoding.|
|16357|New|Enh|2003-01-23|"connection timeout reached"  |
|16531|New|Enh|2003-01-29|Updating already deployed ".war" files in a single|
|16579|New|Enh|2003-01-30|documentation page layout/style breaks wrapping to|
|16596|New|Enh|2003-01-30|option for disabling log rotation |
|17070|New|Enh|2003-02-14|The Catalina Ant tasks do not allow for 'reusable'|
|17146|New|Enh|2003-02-18|Simplify build.xml using 

Ursula Witte/NORDLB ist außer Haus.

2006-06-04 Thread Ursula Witte

Ich werde ab  02.06.2006 nicht im Büro sein. Ich kehre zurück am
07.06.2006.

Ich werde Ihre Nachricht nach meiner Rückkehr beantworten.


Die in dieser E-Mail enthaltenen Informationen sind vertraulich. Diese
E-Mail ist ausschliesslich fuer den Adressaten bestimmt und jeglicher
Zugriff durch andere Personen ist nicht zulaessig. Falls Sie nicht einer
der genannten Empfaenger sind, ist jede Veroeffentlichung,
Vervielfaeltigung, Verteilung oder sonstige in diesem Zusammenhang stehende
Handlung untersagt und unter Umstaenden ungesetzlich. Sollte diese
Nachricht nicht fuer Sie bestimmt sein, so bitten wir Sie, den Absender
unverzueglich zu informieren und die E-Mail zu loeschen.

The information in this e-mail is confidential. It is intended solely for
the addressee and access to the e-mail by anyone else is unauthorised. If
you are not a named recipient, any disclosure, copying, distribution or any
action taken or omitted to be taken in reliance on it, is prohibited and
may be unlawful. If the notice is not intended for you, please notify the
sender immediately and delete the e-mail.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[EMAIL PROTECTED]: Project tomcat-tc6 (in module tomcat-tc6) failed

2006-06-04 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project tomcat-tc6 has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc6 :  Java Servlet 2.5 & Server Pages JSP 2.1 implementation (for 
...


Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-tc6/tomcat-tc6/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -DEBUG- Extracted fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-tc6/tomcat-tc6/gump_work/build_tomcat-tc6_tomcat-tc6.html
Work Name: build_tomcat-tc6_tomcat-tc6 (Type: Build)
Work ended in a state of : Failed
Elapsed: 16 secs
Command Line: java -Djava.awt.headless=true org.apache.tools.ant.Main 
-Dgump.merge=/x1/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only 
-Dcommons-logging-api.jar=/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-api-04062006.jar
 
-Dtomcat-dbcp.jar=/usr/local/gump/public/workspace/tomcat-tc6/tomcat-deps/tomcat-jdbc-04062006.jar
 
-Djasper-jdt.jar=/usr/local/gump/packages/eclipse-3.1M6/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar
 
[Working Directory: /usr/local/gump/public/workspace/tomcat-tc6]
CLASSPATH: 
/opt/jdk1.5/lib/tools.jar:/usr/local/gump/public/workspace/tomcat-tc6/classes:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar:/usr/local/gump/packages/junit3.8.1/junit.jar:/usr/local/gump/public/workspace/xml-commons/java/build/resolver.jar:/usr/local/gump/public/workspace/dist/junit/junit.jar:/usr/local/gump/packages/javamail-1.4/mail.jar:/usr/local/gump/packages/javamail-1.4/lib/mailapi.jar:/usr/local/gump/packages/jaf-1.1ea/activation.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-api-04062006.jar:/usr/local/gump/packages/eclipse-3.1M6/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar:/usr/local/gump/public/workspace/tomcat-tc6/tomcat-deps/tomcat-jdbc-04062006.jar
-
[javac] 
^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/ClassNameMBean.java:36:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 302726 $ $Date: 2004-02-27 15:59:07 +0100 
(ven., 27 f??vr. 2004) $
[javac] 
 ^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java:38:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 302726 $ $Date: 2004-02-27 15:59:07 +0100 
(ven., 27 f??vr. 2004) $
[javac] 
^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java:38:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 302726 $ $Date: 2004-02-27 15:59:07 +0100 
(ven., 27 f??vr. 2004) $
[javac] 
 ^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java:38:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 302726 $ $Date: 2004-02-27 15:59:07 +0100 
(ven., 27 f??vr. 2004) $
[javac] 
^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java:38:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 302726 $ $Date: 2004-02-27 15:59:07 +0100 
(ven., 27 f??vr. 2004) $
[javac] 
 ^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/DefaultContextMBean.java:40:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 303133 $ $Date: 2004-08-29 18:46:15 +0200 
(

[EMAIL PROTECTED]: Project tomcat-tc6 (in module tomcat-tc6) failed

2006-06-04 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project tomcat-tc6 has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc6 :  Java Servlet 2.5 & Server Pages JSP 2.1 implementation (for 
...


Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-tc6/tomcat-tc6/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed
 -DEBUG- Extracted fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-tc6/tomcat-tc6/gump_work/build_tomcat-tc6_tomcat-tc6.html
Work Name: build_tomcat-tc6_tomcat-tc6 (Type: Build)
Work ended in a state of : Failed
Elapsed: 16 secs
Command Line: java -Djava.awt.headless=true org.apache.tools.ant.Main 
-Dgump.merge=/x1/gump/public/gump/work/merge.xml -Dbuild.sysclasspath=only 
-Dcommons-logging-api.jar=/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-api-04062006.jar
 
-Dtomcat-dbcp.jar=/usr/local/gump/public/workspace/tomcat-tc6/tomcat-deps/tomcat-jdbc-04062006.jar
 
-Djasper-jdt.jar=/usr/local/gump/packages/eclipse-3.1M6/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar
 
[Working Directory: /usr/local/gump/public/workspace/tomcat-tc6]
CLASSPATH: 
/opt/jdk1.5/lib/tools.jar:/usr/local/gump/public/workspace/tomcat-tc6/classes:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar:/usr/local/gump/packages/junit3.8.1/junit.jar:/usr/local/gump/public/workspace/xml-commons/java/build/resolver.jar:/usr/local/gump/public/workspace/dist/junit/junit.jar:/usr/local/gump/packages/javamail-1.4/mail.jar:/usr/local/gump/packages/javamail-1.4/lib/mailapi.jar:/usr/local/gump/packages/jaf-1.1ea/activation.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-api-04062006.jar:/usr/local/gump/packages/eclipse-3.1M6/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar:/usr/local/gump/public/workspace/tomcat-tc6/tomcat-deps/tomcat-jdbc-04062006.jar
-
[javac] 
^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/ClassNameMBean.java:36:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 302726 $ $Date: 2004-02-27 15:59:07 +0100 
(ven., 27 f??vr. 2004) $
[javac] 
 ^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java:38:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 302726 $ $Date: 2004-02-27 15:59:07 +0100 
(ven., 27 f??vr. 2004) $
[javac] 
^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java:38:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 302726 $ $Date: 2004-02-27 15:59:07 +0100 
(ven., 27 f??vr. 2004) $
[javac] 
 ^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java:38:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 302726 $ $Date: 2004-02-27 15:59:07 +0100 
(ven., 27 f??vr. 2004) $
[javac] 
^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java:38:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 302726 $ $Date: 2004-02-27 15:59:07 +0100 
(ven., 27 f??vr. 2004) $
[javac] 
 ^
[javac] 
/x1/gump/public/workspace/tomcat-tc6/java/org/apache/catalina/mbeans/DefaultContextMBean.java:40:
 warning: unmappable character for encoding ASCII
[javac]  * @version $Revision: 303133 $ $Date: 2004-08-29 18:46:15 +0200 
(

Re: What happened to the mod_jk 1.2.16 release?

2006-06-04 Thread David Rees

On 6/3/06, Rainer Jung <[EMAIL PROTECTED]> wrote:

Mladen Turk wants to add some small changes. After that we will do some
testing again and then release. Any input from your side about
intermediate test results on trunk will be highly appreciated.


OK, I see that mladen has recently checked in some jk changes. As soon
as he gives the word, I'll check out the latest from SVN and do some
testing.

-Dave

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]