DO NOT REPLY [Bug 43423] - catalina.sh -force too fast

2007-09-30 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43423





--- Additional Comments From [EMAIL PROTECTED]  2007-09-30 02:06 ---
I don't like the patch, but the feature are usefull.

Tipp: Use the Java Service Wrapper :-)

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 43516] - mod_jk memory leak (apache reload)

2007-09-30 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43516





--- Additional Comments From [EMAIL PROTECTED]  2007-09-30 06:54 ---
Can you confirm, that the problem only happens, if the vhosts have no individual
JK configuration? I.e. as soon as you add an individual JkLogFile or an
individual JkMount to each host, then there is no restart leak.

If this is the case, I now know the cause of th eproblem and will think about
the right way of fixing it.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r580754 - in /tomcat/tc6.0.x/trunk: STATUS java/org/apache/tomcat/util/http/Cookies.java webapps/docs/changelog.xml

2007-09-30 Thread remm 
Author: remm
Date: Sun Sep 30 10:03:22 2007
New Revision: 580754

URL: http://svn.apache.org/viewvc?rev=580754&view=rev
Log:
- Cookie parser update.
- Submitted by John Kew, with an update to the initialization
  of the boolean array (hopefully easier to read and modify).

Modified:
tomcat/tc6.0.x/trunk/STATUS
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=580754&r1=580753&r2=580754&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Sun Sep 30 10:03:22 2007
@@ -25,12 +25,6 @@
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* New cookie parser (third party contribution)
-  http://people.apache.org/~jfclere/patches/Cookies.java.remy.patch
-  http://people.apache.org/~jfclere/patches/CookiesTest.patch
-  +1: jfclere, fhanik, pero
-  -1: 
-
 * Fix request processing time on the Coyote statistics info
   http://issues.apache.org/bugzilla/show_bug.cgi?id=43487
   +1: fhanik, pero, rjung

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java?rev=580754&r1=580753&r2=580754&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java Sun Sep 
30 10:03:22 2007
@@ -45,7 +45,28 @@
 boolean unprocessed=true;
 
 MimeHeaders headers;
-
+
+/*
+List of Separator Characters (see isSeparator())
+Excluding the '/' char violates the RFC, but 
+it looks like a lot of people put '/'
+in unquoted values: '/': ; //47 
+'\t':9 ' ':32 '\"':34 '\'':39 '(':40 ')':41 ',':44 ':':58 ';':59 '<':60 
+'=':61 '>':62 '?':63 '@':64 '[':91 '\\':92 ']':93 '{':123 '}':125
+*/
+public static final char SEPARATORS[] = { '\t', ' ', '\"', '\'', '(', ')', 
',', 
+':', ';', '<', '=', '>', '?', '@', '[', '\\', ']', '{', '}' };
+
+protected static final boolean separators[] = new boolean[128];
+static {
+for (int i = 0; i < 128; i++) {
+separators[i] = false;
+}
+for (int i = 0; i < SEPARATORS.length; i++) {
+separators[SEPARATORS[i]] = true;
+}
+}
+
 /**
  *  Construct a new cookie collection, that will extract
  *  the information from headers.
@@ -182,181 +203,6 @@
 }
 }
 
-/** Process a byte[] header - allowing fast processing of the
- *  raw data
- */
-void processCookieHeader(  byte bytes[], int off, int len )
-{
-if( len<=0 || bytes==null ) return;
-int end=off+len;
-int pos=off;
-
-int version=0; //sticky
-ServerCookie sc=null;
-
-
-while( pos=end )
-return; // only spaces
-int startName=pos;
-if( dbg>0 ) log( "SN: " + pos );
-
-// Version should be the first token
-boolean isSpecial=false;
-if(bytes[pos]=='$') { pos++; isSpecial=true; }
-
-pos= findDelim1( bytes, startName, end); // " =;,"
-int endName=pos;
-// current = "=" or " " or DELIM
-pos= skipSpaces( bytes, endName, end ); 
-if( dbg>0 ) log( "DELIM: " + endName + " " + (char)bytes[pos]);
-
-if(pos >= end ) {
-// it's a name-only cookie ( valid in RFC2109 )
-if( ! isSpecial ) {
-sc=addCookie();
-sc.getName().setBytes( bytes, startName,
-   endName-startName );
-sc.getValue().setString("");
-sc.setVersion( version );
-if( dbg>0 ) log( "Name only, end: " + startName + " " +
- endName);
-}
-return;
-}
-
-cc=bytes[pos];
-pos++;
-if( cc==';' || cc==',' || pos>=end ) {
-if( ! isSpecial && startName!= endName ) {
-sc=addCookie();
-sc.getName().setBytes( bytes, startName,
-   endName-startName );
-sc.getValue().setString("");
-sc.setVersion( version );
-if( dbg>0 ) log( "Name only: " + startName + " " + 
endName);
-}
-continue;
-}
-
-// we should have "=" ( tested all other alternatives )
-int startValue=skipSpaces( bytes, pos, end);
-int endValue

DO NOT REPLY [Bug 43516] - mod_jk memory leak (apache reload)

2007-09-30 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43516





--- Additional Comments From [EMAIL PROTECTED]  2007-09-30 12:02 ---
Yes! i could only make a short test, but you are right. with individual
JK configuration it seems to be ok

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r580779 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

2007-09-30 Thread rjung 
Author: rjung
Date: Sun Sep 30 13:26:34 2007
New Revision: 580779

URL: http://svn.apache.org/viewvc?rev=580779&view=rev
Log:
Use BIG_POOL_SIZE instead of SMALL_POOL_SIZE,
because that's the buffer size we defined in the
jk_uri_worker_map.h header file.

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=580779&r1=580778&r2=580779&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sun Sep 30 
13:26:34 2007
@@ -414,7 +414,7 @@
 
 rc = JK_TRUE;
 jk_open_pool(&uw_map->p,
- uw_map->buf, sizeof(jk_pool_atom_t) * SMALL_POOL_SIZE);
+ uw_map->buf, sizeof(jk_pool_atom_t) * BIG_POOL_SIZE);
 uw_map->size = 0;
 uw_map->maps = NULL;
 



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

svn commit: r580780 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

2007-09-30 Thread rjung 
Author: rjung
Date: Sun Sep 30 13:32:19 2007
New Revision: 580780

URL: http://svn.apache.org/viewvc?rev=580780&view=rev
Log:
Move basic initialization of jk_uri_worker_map
from uri_worker_map_open() to uri_worker_map_alloc().
We don't always call uri_worker_map_open().

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=580780&r1=580779&r2=580780&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sun Sep 30 
13:32:19 2007
@@ -193,6 +193,13 @@
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
+
+jk_open_pool(&((*uw_map)->p),
+ (*uw_map)->buf, sizeof(jk_pool_atom_t) * BIG_POOL_SIZE);
+(*uw_map)->size = 0;
+(*uw_map)->capacity = 0;
+(*uw_map)->maps = NULL;
+
 if (init_data)
 rc = uri_worker_map_open(*uw_map, init_data, l);
 JK_TRACE_EXIT(l);
@@ -406,19 +413,8 @@
 
 JK_TRACE_ENTER(l);
 
-uw_map->size = 0;
-uw_map->capacity = 0;
-
 if (uw_map) {
-int sz;
-
-rc = JK_TRUE;
-jk_open_pool(&uw_map->p,
- uw_map->buf, sizeof(jk_pool_atom_t) * BIG_POOL_SIZE);
-uw_map->size = 0;
-uw_map->maps = NULL;
-
-sz = jk_map_size(init_data);
+int sz = jk_map_size(init_data);
 
 jk_log(l, JK_LOG_DEBUG,
"rule map size is %d",



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

svn commit: r580781 - /tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c

2007-09-30 Thread rjung 
Author: rjung
Date: Sun Sep 30 13:35:38 2007
New Revision: 580781

URL: http://svn.apache.org/viewvc?rev=580781&view=rev
Log:
Add initialization of all struct members of
jk_uri_worker_map to uri_worker_map_alloc().
Add helper variable to remove lots of derefs.

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=580781&r1=580780&r2=580781&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sun Sep 30 
13:35:38 2007
@@ -176,16 +176,18 @@
 return (str[x] != '\0');
 }
 
-int uri_worker_map_alloc(jk_uri_worker_map_t **uw_map,
+int uri_worker_map_alloc(jk_uri_worker_map_t **uw_map_p,
  jk_map_t *init_data, jk_logger_t *l)
 {
 JK_TRACE_ENTER(l);
 
-if (uw_map) {
+if (uw_map_p) {
 int rc;
-*uw_map = (jk_uri_worker_map_t *)calloc(1, 
sizeof(jk_uri_worker_map_t));
+jk_uri_worker_map_t *uw_map;
+*uw_map_p = (jk_uri_worker_map_t *)calloc(1, 
sizeof(jk_uri_worker_map_t));
+uw_map = *uw_map_p;
 
-JK_INIT_CS(&((*uw_map)->cs), rc);
+JK_INIT_CS(&(uw_map->cs), rc);
 if (rc == JK_FALSE) {
 jk_log(l, JK_LOG_ERROR,
"creating thread lock (errno=%d)",
@@ -194,14 +196,20 @@
 return JK_FALSE;
 }
 
-jk_open_pool(&((*uw_map)->p),
- (*uw_map)->buf, sizeof(jk_pool_atom_t) * BIG_POOL_SIZE);
-(*uw_map)->size = 0;
-(*uw_map)->capacity = 0;
-(*uw_map)->maps = NULL;
+jk_open_pool(&(uw_map->p),
+ uw_map->buf, sizeof(jk_pool_atom_t) * BIG_POOL_SIZE);
+uw_map->size = 0;
+uw_map->nosize = 0;
+uw_map->capacity = 0;
+uw_map->maps = NULL;
+uw_map->fname = NULL;
+uw_map->reject_unsafe = 0;
+uw_map->reload = JK_URIMAP_DEF_RELOAD;
+uw_map->modified = 0;
+uw_map->checked = 0;
 
 if (init_data)
-rc = uri_worker_map_open(*uw_map, init_data, l);
+rc = uri_worker_map_open(uw_map, init_data, l);
 JK_TRACE_EXIT(l);
 return rc;
 }



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

svn commit: r580785 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-09-30 Thread rjung 
Author: rjung
Date: Sun Sep 30 13:53:54 2007
New Revision: 580785

URL: http://svn.apache.org/viewvc?rev=580785&view=rev
Log:
Remove configuration attributes secret_key and automount
(directive JkAutoMount) from httpd module.
They were never documented and didn't have any functionality
apart from eating memory and bloating code either.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=580785&r1=580784&r2=580785&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Sep 30 13:53:54 
2007
@@ -137,8 +137,6 @@
 jk_map_t *uri_to_context;
 
 int mountcopy;
-char *secret_key;
-jk_map_t *automount;
 
 jk_uri_worker_map_t *uw_map;
 
@@ -909,28 +907,6 @@
 }
 
 /*
- * JkAutoMount directive handling
- *
- * JkAutoMount worker [virtualhost]
- */
-
-static const char *jk_automount_context(cmd_parms * cmd,
-void *dummy,
-char *worker, char *virtualhost)
-{
-server_rec *s = cmd->server;
-jk_server_conf_t *conf =
-(jk_server_conf_t *) ap_get_module_config(s->module_config,
-  &jk_module);
-
-/*
- * Add the new automount to the auto map.
- */
-jk_map_put(conf->automount, worker, virtualhost, NULL);
-return NULL;
-}
-
-/*
  * JkWorkersFile Directive Handling
  *
  * JkWorkersFile file
@@ -1857,13 +1833,6 @@
  "the reload check interval of the mount file"},
 
 /*
- * JkAutoMount specifies that the list of handled URLs must be
- * asked to the servlet engine (autoconf feature)
- */
-{"JkAutoMount", jk_automount_context, NULL, RSRC_CONF, TAKE12,
- "automatic mount points to a servlet-engine worker"},
-
-/*
  * JkMount mounts a url prefix to a worker (the worker need to be
  * defined in the worker properties file.
  */
@@ -2260,11 +2229,7 @@
 if (!jk_map_alloc(&(c->uri_to_context))) {
 jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
 }
-if (!jk_map_alloc(&(c->automount))) {
-jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
-}
 c->uw_map = NULL;
-c->secret_key = NULL;
 
 c->envvars_in_use = JK_FALSE;
 c->envvars = ap_make_table(p, 0);
@@ -2328,9 +2293,6 @@
 if (!overrides->key_size_indicator)
 overrides->key_size_indicator = base->key_size_indicator;
 
-if (!overrides->secret_key)
-overrides->secret_key = base->secret_key;
-
 overrides->options |= (base->options & ~base->exclude_options);
 
 if (base->envvars_in_use) {
@@ -2365,7 +2327,6 @@
 if (overrides->mountcopy) {
 copy_jk_map(p, overrides->s, base->uri_to_context,
 overrides->uri_to_context);
-copy_jk_map(p, overrides->s, base->automount, overrides->automount);
 if (!overrides->mount_file)
 overrides->mount_file = base->mount_file;
 if (!overrides->alias_dir)
@@ -2607,19 +2568,6 @@
  * to make sure log file gets closed in the parent process  */
 ap_register_cleanup(p, s, jk_server_cleanup, ap_null_cleanup);
 
-/*
-{ int i;
-if (JK_IS_DEBUG_LEVEL(conf->log))
-jk_log(conf->log, JK_LOG_DEBUG, "default secret key = %s", 
conf->secret_key);
-for (i = 0; i < jk_map_size(conf->automount); i++)
-{
-char *name = jk_map_name_at(conf->automount, i);
-if (JK_IS_DEBUG_LEVEL(conf->log))
-jk_log(conf->log, JK_LOG_DEBUG, "worker = %s and virtualhost = 
%s", name, map_get_string(conf->automount, name, NULL));
-}
-}
-*/
-
 if ((conf->worker_file != NULL) &&
 !jk_map_read_properties(init_map, conf->worker_file, NULL,
 JK_MAP_HANDLE_DUPLICATES, conf->log)) {
@@ -2936,7 +2884,6 @@
 uri_worker_map_free(&(conf->uw_map), NULL);
 jk_map_free(&(conf->uri_to_context));
 jk_map_free(&(conf->worker_properties));
-jk_map_free(&(conf->automount));
 }
 tmp = tmp->next;
 }

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=580785&r1=580784&r2=580785&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Sep 30 13:53:54 
2007
@@ -166,8 +166,6 @@
 jk_map_t *uri_to_context;
 
 int mountcopy;
-char *secret_key;
-jk_map_t *automount;
 
 jk_uri_worker_map_t *uw_map;
 
@@ -937,

svn commit: r580793 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-09-30 Thread rjung 
Author: rjung
Date: Sun Sep 30 14:30:49 2007
New Revision: 580793

URL: http://svn.apache.org/viewvc?rev=580793&view=rev
Log:
Remove worker_properties and worker_file from per server config.
They are global.
Do not allow multiple JkWorkerFile directives.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=580793&r1=580792&r2=580793&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Sep 30 14:30:49 
2007
@@ -128,10 +128,8 @@
 jk_logger_t *log;
 
 /*
- * Worker stuff
+ * Mount stuff
  */
-jk_map_t *worker_properties;
-char *worker_file;
 char *mount_file;
 int mount_file_reload;
 jk_map_t *uri_to_context;
@@ -156,7 +154,7 @@
 /*
  * Setting target worker via environment
  */
-   char *worker_indicator;
+char *worker_indicator;
 
 /*
  * SSL Support
@@ -220,6 +218,11 @@
 static jk_worker_env_t worker_env;
 static char *jk_shm_file = NULL;
 static size_t jk_shm_size = JK_SHM_DEF_SIZE;
+/*
+ * Worker stuff
+*/
+static jk_map_t *jk_worker_properties = NULL;
+static char *jk_worker_file = NULL;
 
 static int JK_METHOD ws_start_response(jk_ws_service_t *s,
int status,
@@ -915,27 +918,25 @@
 static const char *jk_set_worker_file(cmd_parms * cmd,
   void *dummy, char *worker_file)
 {
-server_rec *s = cmd->server;
 struct stat statbuf;
 
-jk_server_conf_t *conf =
-(jk_server_conf_t *) ap_get_module_config(s->module_config,
-  &jk_module);
+if (jk_worker_file != NULL)
+return "JkWorkersFile only allowed once";
 
 /* we need an absolute path */
-conf->worker_file = ap_server_root_relative(cmd->pool, worker_file);
+jk_worker_file = ap_server_root_relative(cmd->pool, worker_file);
 
 #ifdef CHROOTED_APACHE
-ap_server_strip_chroot(conf->worker_file, 0);
+ap_server_strip_chroot(jk_worker_file, 0);
 #endif
 
-if (conf->worker_file == worker_file)
-conf->worker_file = ap_pstrdup(cmd->pool, worker_file);
+if (jk_worker_file == worker_file)
+jk_worker_file = ap_pstrdup(cmd->pool, worker_file);
 
-if (conf->worker_file == NULL)
+if (jk_worker_file == NULL)
 return "JkWorkersFile file name invalid";
 
-if (stat(conf->worker_file, &statbuf) == -1)
+if (stat(jk_worker_file, &statbuf) == -1)
 return "Can't find the workers file specified";
 
 return NULL;
@@ -1795,7 +1796,7 @@
 (jk_server_conf_t *) ap_get_module_config(s->module_config,
   &jk_module);
 
-if (jk_map_read_property(conf->worker_properties, line,
+if (jk_map_read_property(jk_worker_properties, line,
  JK_MAP_HANDLE_DUPLICATES, conf->log) == JK_FALSE)
 return ap_pstrcat(cmd->temp_pool, "Invalid JkWorkerProperty ", line, 
NULL);
 
@@ -2176,9 +2177,6 @@
 jk_server_conf_t *c =
 (jk_server_conf_t *) ap_pcalloc(p, sizeof(jk_server_conf_t));
 
-c->worker_properties = NULL;
-jk_map_alloc(&c->worker_properties);
-c->worker_file = NULL;
 c->mount_file = NULL;
 c->log_file = NULL;
 c->log_fd = -1;
@@ -2237,7 +2235,6 @@
 c->envvar_items = ap_make_array(p, 0, sizeof(envvar_item));
 
 c->s = s;
-jk_map_put(c->worker_properties, "ServerRoot", ap_server_root, NULL);
 
 return c;
 }
@@ -2475,7 +2472,8 @@
 jk_server_conf_t *conf =
 (jk_server_conf_t *) ap_get_module_config(s->module_config,
   &jk_module);
-jk_map_t *init_map = conf->worker_properties;
+jk_map_alloc(&jk_worker_properties);
+jk_map_put(jk_worker_properties, "ServerRoot", ap_server_root, NULL);
 
 jk_log_fds = ap_make_table(p, 0);
 
@@ -2568,15 +2566,16 @@
  * to make sure log file gets closed in the parent process  */
 ap_register_cleanup(p, s, jk_server_cleanup, ap_null_cleanup);
 
-if ((conf->worker_file != NULL) &&
-!jk_map_read_properties(init_map, conf->worker_file, NULL,
+if ((jk_worker_file != NULL) &&
+!jk_map_read_properties(jk_worker_properties, jk_worker_file, NULL,
 JK_MAP_HANDLE_DUPLICATES, conf->log)) {
 jk_error_exit(APLOG_MARK, APLOG_EMERG | APLOG_NOERRNO, s, p,
   "Error in reading worker properties from '%s'",
-  conf->worker_file);
+  jk_worker_file);
 }
 
-if (jk_map_resolve_references(init_map, "worker.", 1, 1, conf->log) == 
JK_FALSE) {
+if (jk_

svn commit: r580798 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-09-30 Thread rjung 
Author: rjung
Date: Sun Sep 30 14:51:29 2007
New Revision: 580798

URL: http://svn.apache.org/viewvc?rev=580798&view=rev
Log:
Don't double init or destroy per server config.
Use was_initialized in a consistent way for
apache httpd 1.3 and 2.x.
Move logger open inside the double init check.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=580798&r1=580797&r2=580798&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Sep 30 14:51:29 
2007
@@ -138,6 +138,8 @@
 
 jk_uri_worker_map_t *uw_map;
 
+int was_initialized;
+
 /*
  * Automatic context path apache alias
  */
@@ -2187,6 +2189,7 @@
 c->format = NULL;
 c->mountcopy = JK_FALSE;
 c->exclude_options = 0;
+c->was_initialized = JK_FALSE;
 
 if (s->is_virtual) {
 c->mount_file_reload = JK_UNSET;
@@ -2483,8 +2486,9 @@
 for (; srv; srv = srv->next) {
 jk_server_conf_t *sconf = (jk_server_conf_t 
*)ap_get_module_config(srv->module_config,

&jk_module);
-open_jk_log(srv, p);
-if (sconf) {
+if (sconf && sconf->was_initialized == JK_FALSE) {
+sconf->was_initialized = JK_TRUE;
+open_jk_log(srv, p);
 sconf->options &= ~sconf->exclude_options;
 if (!uri_worker_map_alloc(&(sconf->uw_map),
   sconf->uri_to_context, sconf->log))
@@ -2865,11 +2869,9 @@
 /** BEGIN SREVILAK
  * body taken from exit_handler()
  */
-static void jk_generic_cleanup(server_rec * s)
+static void jk_generic_cleanup(server_rec *s)
 {
 
-server_rec *tmp = s;
-
 if (jk_worker_properties) {
 jk_map_free(&jk_worker_properties);
 jk_worker_properties = NULL;
@@ -2879,17 +2881,24 @@
 /* loop through all available servers to clean up all configuration
  * records we've created
  */
-while (NULL != tmp) {
+while (NULL != s) {
 jk_server_conf_t *conf =
-(jk_server_conf_t *) ap_get_module_config(tmp->module_config,
+(jk_server_conf_t *) ap_get_module_config(s->module_config,
   &jk_module);
 
-if (conf) {
+if (conf && conf->was_initialized == JK_TRUE) {
+/* On pool cleanup pass NULL for the jk_logger to
+   prevent segmentation faults on Windows because
+   we can't guarantee what order pools get cleaned
+   up between APR implementations. */
 wc_close(NULL);
-uri_worker_map_free(&(conf->uw_map), NULL);
-jk_map_free(&(conf->uri_to_context));
+if (conf->uri_to_context)
+jk_map_free(&conf->uri_to_context);
+if (conf->uw_map)
+uri_worker_map_free(&conf->uw_map, NULL);
+conf->was_initialized = JK_FALSE;
 }
-tmp = tmp->next;
+s = s->next;
 }
 }
 

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=580798&r1=580797&r2=580798&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Sep 30 14:51:29 
2007
@@ -2269,18 +2269,17 @@
 (jk_server_conf_t *) ap_get_module_config(s->module_config,
   &jk_module);
 
-if (conf && conf->uw_map) {
+if (conf && conf->was_initialized == JK_TRUE) {
 /* On pool cleanup pass NULL for the jk_logger to
prevent segmentation faults on Windows because
we can't guarantee what order pools get cleaned
up between APR implementations. */
-if (conf->was_initialized)
-wc_close(NULL);
+wc_close(NULL);
 if (conf->uri_to_context)
 jk_map_free(&conf->uri_to_context);
 if (conf->uw_map)
 uri_worker_map_free(&conf->uw_map, NULL);
-conf->was_initialized   = JK_FALSE;
+conf->was_initialized = JK_FALSE;
 }
 s = s->next;
 }
@@ -2766,7 +2765,7 @@
 if (!s->is_virtual) {
 conf = (jk_server_conf_t *)ap_get_module_config(s->module_config,
 &jk_module);
-if (!conf->was_initialized) {
+if (conf->was_initialized == JK_FALSE) {
 con

svn commit: r580799 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

2007-09-30 Thread rjung 
Author: rjung
Date: Sun Sep 30 14:54:31 2007
New Revision: 580799

URL: http://svn.apache.org/viewvc?rev=580799&view=rev
Log:
Correct indentation.

Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=580799&r1=580798&r2=580799&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Sep 30 14:54:31 
2007
@@ -1982,8 +1982,8 @@
  * Servlet Engine
  */
 AP_INIT_TAKE12("JkEnvVar", jk_add_env_var, NULL, RSRC_CONF,
-  "Adds a name of environment variable and an optional value "
-  "that should be sent to servlet-engine"),
+   "Adds a name of environment variable and an optional value "
+   "that should be sent to servlet-engine"),
 
 AP_INIT_RAW_ARGS("JkWorkerProperty", jk_set_worker_property,
  NULL, RSRC_CONF,



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

svn commit: r580800 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-09-30 Thread rjung 
Author: rjung
Date: Sun Sep 30 15:17:48 2007
New Revision: 580800

URL: http://svn.apache.org/viewvc?rev=580800&view=rev
Log:
Clone server config in case a servers share their
config.
Because by default we (unfortunately)
don't inherit mounts between servers, a vhost with
no JK directive needs to become it's own server
config with an empty uw_map.
In this case Apache httpd itself will not call our
config create function and we need to clone the
config ourselves.
The old code simply overwrote uw_map with a new one
and the old one never got freed leading to a memory
leak of 8KB per vhost with no JK directoves.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=580800&r1=580799&r2=580800&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Sep 30 15:17:48 
2007
@@ -2243,6 +2243,31 @@
 }
 
 
+/*
+ *  Clone jk config.
+ */
+static void *clone_jk_config(ap_pool * p, server_rec *s)
+{
+jk_server_conf_t *src =
+(jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
+jk_server_conf_t *dst =
+(jk_server_conf_t *) ap_pcalloc(p, sizeof(jk_server_conf_t));
+
+memcpy(dst, src, sizeof(jk_server_conf_t));
+dst->was_initialized = JK_TRUE;
+dst->s = s;
+dst->mountcopy = 0;
+dst->mount_file = NULL;
+dst->alias_dir = NULL;
+dst->uri_to_context = NULL;
+if (!uri_worker_map_alloc(&(dst->uw_map), NULL, dst->log)) {
+jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
+}
+
+return dst;
+}
+
+
 static void copy_jk_map(ap_pool * p, server_rec * s, jk_map_t *src,
 jk_map_t *dst)
 {
@@ -2486,7 +2511,11 @@
 for (; srv; srv = srv->next) {
 jk_server_conf_t *sconf = (jk_server_conf_t 
*)ap_get_module_config(srv->module_config,

&jk_module);
-if (sconf && sconf->was_initialized == JK_FALSE) {
+if (sconf && sconf->was_initialized == JK_TRUE) {
+ap_set_module_config(srv->module_config, &jk_module,
+ clone_jk_config(p, srv));
+}
+else if (sconf && sconf->was_initialized == JK_FALSE) {
 sconf->was_initialized = JK_TRUE;
 open_jk_log(srv, p);
 sconf->options &= ~sconf->exclude_options;

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=580800&r1=580799&r2=580800&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Sep 30 15:17:48 
2007
@@ -2358,6 +2358,31 @@
 }
 
 
+/** Clone jk config.
+ */
+static void *clone_jk_config(apr_pool_t * p, server_rec *s)
+{
+jk_server_conf_t *src =
+(jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
+jk_server_conf_t *dst =
+(jk_server_conf_t *) apr_pcalloc(p, sizeof(jk_server_conf_t));
+
+memcpy(dst, src, sizeof(jk_server_conf_t));
+dst->was_initialized = JK_TRUE;
+dst->s = s;
+dst->mountcopy = 0;
+dst->mount_file = NULL;
+dst->alias_dir = NULL;
+dst->uri_to_context = NULL;
+if (!uri_worker_map_alloc(&(dst->uw_map), NULL, dst->log)) {
+jk_error_exit(APLOG_MARK, APLOG_EMERG, s,
+  s->process->pool, "Memory error");
+}
+
+return dst;
+}
+
+
 /** Utility - copy a map . XXX Should move to jk_map, it's generic code.
  */
 static void copy_jk_map(apr_pool_t * p, server_rec * s, jk_map_t *src,
@@ -2773,7 +2798,11 @@
 for (; srv; srv = srv->next) {
 jk_server_conf_t *sconf = (jk_server_conf_t 
*)ap_get_module_config(srv->module_config,

&jk_module);
-if (sconf && sconf->was_initialized == JK_FALSE) {
+if (sconf && sconf->was_initialized == JK_TRUE) {
+ap_set_module_config(srv->module_config, &jk_module,
+ clone_jk_config(pconf, srv));
+}
+else if (sconf && sconf->was_initialized == JK_FALSE) {
 sconf->was_initialized = JK_TRUE;
 if (open_jklog(srv, pconf))
 return HTTP_INTERNAL_SERVER_ERROR;



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

svn commit: r580808 - in /tomcat/connectors/trunk/jk/xdocs: miscellaneous/changelog.xml reference/apache.xml

2007-09-30 Thread rjung 
Author: rjung
Date: Sun Sep 30 16:11:59 2007
New Revision: 580808

URL: http://svn.apache.org/viewvc?rev=580808&view=rev
Log:
Small additions to JkShmFile documentation.
Contributed by Gerhardus Geldenhuis.

Modified:
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/apache.xml

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=580808&r1=580807&r2=580808&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Sep 30 
16:11:59 2007
@@ -43,6 +43,10 @@
   
   
 
+  
+Documentation: Small additions to JkShmFile documentation.
+Contributed by Gerhardus Geldenhuis. (rjung)
+  
   
 AJP13: Ignore flush packets before we received the response headers. 
(rjung)
   

Modified: tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/apache.xml?rev=580808&r1=580807&r2=580808&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/reference/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/apache.xml Sun Sep 30 16:11:59 
2007
@@ -80,12 +80,26 @@
 
 
 Shared memory file name. Used only on unix platforms.
+The shm file is used by balancer and status workers.
 
 This directive is only allowed once. It must be put into
  the global part of the configuration.
 
 The default value is logs/jk-runtime-status.
-
+It is highly recommended that the shm file be placed on a local
+drive and not an NFS share.
+
+
+The shared memory contains configuration and runtime information for load 
balancer
+workers and their members. It is need in order that all apache children
+
+share the same status information for load balancing members (OK, ERROR, 
...),
+share the information about load taken by the individual workers,
+share the information for the parts of the configuration, which are 
changeable
+during runtime by status workers.
+
+
+
 
 Size of the shared memory file name.
 



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

svn commit: r580809 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c xdocs/miscellaneous/changelog.xml xdocs/reference/apache.xml

2007-09-30 Thread rjung 
Author: rjung
Date: Sun Sep 30 16:22:33 2007
New Revision: 580809

URL: http://svn.apache.org/viewvc?rev=580809&view=rev
Log:
Add new value "All" for JkMountCopy directive.
This will switch the default of JkMountCopy from
Off to On for all virtual servers.
For mass histing this saves a lot of memory,
in case lots of vhosts don't have individual
JK directives. With "All" they will share the same
uw_map, more prcisely they will share the same jk_server_conf.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/apache.xml

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=580809&r1=580808&r2=580809&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Sep 30 16:22:33 
2007
@@ -225,6 +225,7 @@
 */
 static jk_map_t *jk_worker_properties = NULL;
 static char *jk_worker_file = NULL;
+static int jk_mount_copy_all = JK_FALSE;
 
 static int JK_METHOD ws_start_response(jk_ws_service_t *s,
int status,
@@ -811,18 +812,25 @@
 /*
  * JkMountCopy directive handling
  *
- * JkMountCopy On/Off
+ * JkMountCopy On/Off/All
  */
 
-static const char *jk_set_mountcopy(cmd_parms * cmd, void *dummy, int flag)
+static const char *jk_set_mountcopy(cmd_parms * cmd,
+void *dummy, char *mount_copy)
 {
 server_rec *s = cmd->server;
 jk_server_conf_t *conf =
 (jk_server_conf_t *) ap_get_module_config(s->module_config,
   &jk_module);
-
-/* Set up our value */
-conf->mountcopy = flag ? JK_TRUE : JK_FALSE;
+if (! strcasecmp(mount_copy, "all")) {
+jk_mount_copy_all = JK_TRUE;
+}
+else if (strcasecmp(mount_copy, "on") && strcasecmp(mount_copy, "off")) {
+return "JkMountCopy must be All, On or Off";
+}
+else {
+conf->mountcopy = strcasecmp(mount_copy, "off") ? JK_TRUE : JK_FALSE;
+}
 
 return NULL;
 }
@@ -1853,7 +1861,7 @@
  * JkMountCopy specifies if mod_jk should copy the mount points
  * from the main server to the virtual servers.
  */
-{"JkMountCopy", jk_set_mountcopy, NULL, RSRC_CONF, FLAG,
+{"JkMountCopy", jk_set_mountcopy, NULL, RSRC_CONF, TAKE1,
  "Should the base server mounts be copied to the virtual server"},
 
 /*
@@ -2192,6 +2200,7 @@
 c->was_initialized = JK_FALSE;
 
 if (s->is_virtual) {
+c->mountcopy = JK_UNSET;
 c->mount_file_reload = JK_UNSET;
 c->log_level = JK_UNSET;
 c->options = 0;
@@ -2205,6 +2214,7 @@
 c->key_size_indicator = NULL;
 c->strip_session = JK_UNSET;
 } else {
+c->mountcopy = JK_FALSE;
 c->mount_file_reload = JK_URIMAP_DEF_RELOAD;
 c->log_level = JK_LOG_DEF_LEVEL;
 c->options = JK_OPT_FWDURIDEFAULT;
@@ -2349,7 +2359,8 @@
 
 if (overrides->mount_file_reload == JK_UNSET)
 overrides->mount_file_reload = base->mount_file_reload;
-if (overrides->mountcopy) {
+if (overrides->mountcopy == JK_TRUE ||
+(overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE)) {
 copy_jk_map(p, overrides->s, base->uri_to_context,
 overrides->uri_to_context);
 if (!overrides->mount_file)
@@ -2511,7 +2522,7 @@
 for (; srv; srv = srv->next) {
 jk_server_conf_t *sconf = (jk_server_conf_t 
*)ap_get_module_config(srv->module_config,

&jk_module);
-if (sconf && sconf->was_initialized == JK_TRUE) {
+if (sconf && sconf->was_initialized == JK_TRUE && jk_mount_copy_all == 
JK_FALSE) {
 ap_set_module_config(srv->module_config, &jk_module,
  clone_jk_config(p, srv));
 }
@@ -2905,6 +2916,7 @@
 jk_map_free(&jk_worker_properties);
 jk_worker_properties = NULL;
 jk_worker_file = NULL;
+jk_mount_copy_all = JK_FALSE;
 }
 
 /* loop through all available servers to clean up all configuration

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=580809&r1=580808&r2=580809&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Sep 30 16:22:33 
2007
@@ -236,6 +236,7 @@
 */
 static jk_map_t *jk_worker_properties = NULL;
 static char *jk_worker_file = NULL;
+static i

DO NOT REPLY [Bug 43516] - mod_jk memory leak (apache reload)

2007-09-30 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=43516





--- Additional Comments From [EMAIL PROTECTED]  2007-09-30 16:32 ---
I committed a fix. It's a little late now for me for final tests but I would
appreciate, if you could give the fix a try. I put a new tarball under

http://people.apache.org/~rjung/mod_jk-dev/

You can build this version exactly like an official release. The contents of the
tarball is the latest mod_jk code from the code repository (subversion).


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r580815 - /tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java

2007-09-30 Thread billbarker 
Author: billbarker
Date: Sun Sep 30 17:21:48 2007
New Revision: 580815

URL: http://svn.apache.org/viewvc?rev=580815&view=rev
Log:
Fix problem where client-flush loses headers if the response isn't committed yet

Modified:
tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java

Modified: tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java?rev=580815&r1=580814&r2=580815&view=diff
==
--- tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java 
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/jk/core/MsgContext.java Sun Sep 
30 17:21:48 2007
@@ -276,12 +276,15 @@
 
 } else if( actionCode==ActionCode.ACTION_CLIENT_FLUSH ) {
 if( log.isDebugEnabled() ) log.debug("CLIENT_FLUSH " );
+Response res = (Response)param;
+if(!res.isCommitted()) {
+   action(ActionCode.ACTION_COMMIT, res);
+   }
 try {
 source.flush( null, this );
 } catch(IOException iex) {
 // This is logged elsewhere, so debug only here
 log.debug("Error during flush",iex);
-Response res = (Response)param;
 res.setErrorException(iex);
 setStatus(JK_STATUS_ERROR);
 }



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

Bug report for Watchdog [2007/09/30]

2007-09-30 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 [2007/09/30]

2007-09-30 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  |
| |   |   |  |  |
|27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat|
|28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn  |
|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|
|29936|Opn|Blk|2004-07-06|XML parser loading problems by container  |
|30241|Ver|Enh|2004-07-21|Enhance build script to use branch argument when c|
|33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis|
|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|
|34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a|
|34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern|
|34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that|
|35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc|
|35869|Inf|Enh|2005-07-26|Can't run as a service on Windows Server 2003 64-B|
|36133|Inf|Enh|2005-08-10|Support JSS SSL implementation|
|36169|New|Enh|2005-08-12|[PATCH] Enable chunked encoding for requests in II|
|36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi|
|36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's   |
|36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re|
|36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing  |
|36923|New|Nor|2005-10-05|Deactivated EL expressions are not parsed for jsp |
|37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token|
|37072|Ass|Nor|2005-10-13|Encoding mismatch in error condition  |
|37084|Opn|   |2005-10-14|JspC from ant fails on JSPs that use custom taglib|
|37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis|
|37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user  |
|37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre|
|37498|Inf|Nor|2005-11-14|[PATCH] NPE in org.apache.catalina.core.ContainerB|
|37515|Inf|Nor|2005-11-15|smap not generated by JspC when used from Ant for |
|37627|Opn|Nor|2005-11-24|Slow and incomplete dynamic content generation aft|
|37785|Inf|Nor|2005-12-05|Changing startup type via Tomcat Monitor does not |
|37794|Opn|Nor|2005-12-05|getParameter() fails on POST with transfer-encodin|
|37797|Inf|Maj|2005-12-05|Configure Tomcat utility truncates classpath to 96|
|37822|Opn|Nor|2005-12-07|WebappClassLoader interfering with Catalina core c|
|37847|Ass|Enh|2005-12-09|Allow User To Optionally Specify Catalina Output F|
|37869|Opn|Nor|2005-12-12|Cannot obtain client certificate with SSL / client|
|37918|Inf|Nor|2005-12-15|EL cannot find valid getter from object when using|
|37984|New|Nor|2005-12-21|JNDIRealm.java not able to handle MD5 password|
|38001|Inf|Nor|2005-12-22|TruncatedClassFile when loadind applets   |
|38046|Ass|   |2005-12-27|apache-tomcat-5.5.14-deployer doesn't work (Illega|
|38131|New|Enh|2006-01-05|WatchedResource does not work if app is outside "w|
|38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations |
|38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti|
|38290|Inf|Nor|2006-01-16|No SESSION_DESTROYED_EVENT sent for existing webap|
|38291|Inf|Nor|2006-01-16|Form actions hanging in UDecoder.convert  |
|38352|Inf|Nor|2006-01-22|Additional Entries for Default catalina.policy fil|
|38360|Inf|Enh|2006-01-24|Domain for session cookies|
|38367|Inf|Nor|2006-01-24|Executing any Catalina Ant task results in an exce|
|38372|Inf|Cri|2006-01-25|tcnative-1.dll response overflow corruption, parti|
|38427|Inf|Nor|2006-01-27|ServletContextListener Notified Multiple Times Whe|
|38483|

Bug report for Tomcat 3 [2007/09/30]

2007-09-30 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|
| 5331|Ass|Nor|2001-12-09|getPathInfo vs URL normalization  |
| 6027|Inf|Maj|2002-01-25|Tomcat  Automatically shuts down as service   |
| 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c|
| 7785|Inf|Blk|2002-04-06|tomcat bug in context reloading   |
| 7863|Inf|Maj|2002-04-09|I have a problem when running Tomcat with IIS |
| 8187|Inf|Cri|2002-04-17|Errors when Tomcat used with MS Access database   |
| 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p|
|10047|Ass|Cri|2002-06-20|IllegalStateException |
|10406|Ass|Cri|2002-07-02|IllegalStateException |
|11087|Inf|Blk|2002-07-23|IllegalStateException |
|12156|Inf|Cri|2002-08-29|Apache and Tomcat 3.3.1 Interworking problem  |
|16363|Ass|Cri|2003-01-23|Stack Overflow accessing compiled JSP - Tomcat 3.2|
|39250|Inf|Cri|2006-04-07|Tomcat 3.2.1 + JDK 1.4|
+-+---+---+--+--+
| Total   14 bugs   |
+---+

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

Bug report for Tomcat 4 [2007/09/30]

2007-09-30 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|
|12428|Opn|Enh|2002-09-09|request.getUserPrincipal(): Misinterpretation of s|
|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   |
|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