DO NOT REPLY [Bug 42104] - Tomcat crash unespected

[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=42104


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2007-11-19 10:14 ---
This looks like a bug in the JDBC-ODBC native driver. Not in Tomcat

-- 
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: r596404 - /tomcat/tc6.0.x/trunk/STATUS.txt

[jim]

Author: jim
Date: Mon Nov 19 11:27:14 2007
New Revision: 596404

URL: http://svn.apache.org/viewvc?rev=596404&view=rev
Log:
Some votes and propose patched patch.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=596404&r1=596403&r2=596404&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 19 11:27:14 2007
@@ -27,10 +27,9 @@
 
 
 * Fix BZ 43588 - hard coded 127.0.0.1 for localhost
-  http://issues.apache.org/bugzilla/attachment.cgi?id=21039&action=view
-  +1: 
-  -1: funkman InetAddress.getLocalHost() != localhost - it should be
-InetAddress.getByName("localhost").getHostAddress()
+  http://people.apache.org/~jim/patches/tc-localhost.txt
+  +1: jim
+  -1: 
 
 * Add tests for the cookie parsing.
   http://people.apache.org/~jfclere/patches/test_cookies.patch
@@ -43,10 +42,10 @@
   Add in non blocking request header parsing
   This is a port of improvements from the old trunk and fixes the BZ above and 
improves greatly on the NIO connector
   http://people.apache.org/~fhanik/patches/fix-nio-blocking-output.patch
-  +1: fhanik
+  +1: fhanik, jim
   -1: 
   
 * Fix Comet bug, if servlet calls cometEvent.close() on the BEGIN event, the 
request still is marked as comet and ends up in a funky state
   http://people.apache.org/~fhanik/patches/comet-begin-event-close.patch
-  +1: fhanik, markt, pero
+  +1: fhanik, markt, pero, jim
   -1: 



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

svn commit: r596406 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 11:30:29 2007
New Revision: 596406

URL: http://svn.apache.org/viewvc?rev=596406&view=rev
Log:
Return DECLINED for NULL uw_map. This allows to have configured vhosts that 
have no
mappings without need to initialize an empty uw_map.

Ported from r591962 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596406&r1=596405&r2=596406&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 Mon Nov 19 11:30:29 
2007
@@ -2647,7 +2647,17 @@
 }
 
 ap_no2slash(clean_uri);
-worker = map_uri_to_worker(conf->uw_map, clean_uri, NULL, 
conf->log);
+if (!conf->uw_map) {
+if (JK_IS_DEBUG_LEVEL(conf->log))
+jk_log(conf->log, JK_LOG_DEBUG,
+   "missing uri map for %s:%s",
+   conf->s->server_hostname ? conf->s->server_hostname 
: "_default_",
+   r->uri);
+return DECLINED;
+}
+else
+worker = map_uri_to_worker(conf->uw_map, clean_uri,
+   NULL, conf->log);
 
 /* Don't know the worker, ForwardDirectories is set, there is a
  * previous request for which the handler is JK_HANDLER (as set by



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

Re: [VOTE] Release build 6.0.15

[Filip Hanik - Dev Lists]

Remy Maucherat wrote:

On Sat, 2007-11-10 at 19:41 +0100, Remy Maucherat wrote:
  

On Fri, 2007-11-09 at 22:23 +, Mark Thomas wrote:


These sources can be found in the specification documents.


That doesn't mean we can just copy them.

  

Geronimo
should also have the same files somewhere.


I believe they use the CDDL ones but I'll check. I'll prepare a patch for
6.0.16 that uses whatever they use.
  

There's also the option of not shipping those files, it would only
remove (until the user adds an official jar somewhere) validation
capabilities for the newest webapps.

So, the possibilities are:
1) Add a CDDL xsd
2) Remove xsd
3) Use some binary from somewhere



Since this issue is now resolved (along with the cookie issue), I would like to 
tag a new Tomcat build shortly (preferably not including tons of new patches, 
otherwise there could be new regressions).
  
sounds good, I'd like to get the NIO and Comet patches in there. While 
the NIO patch is scary long, I've been running it out of my own build 
for quite a while and it addresses many issues. Remember this week is 
thanksgiving week, so many folks are taking the entire week (or at a 
minimum end of week) off.


Filip

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

svn commit: r596407 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 11:44:47 2007
New Revision: 596407

URL: http://svn.apache.org/viewvc?rev=596407&view=rev
Log:
Make envvar tables created on demand. Only non virtual hosts have pre-allocated
tables, other are allocated if JkEnvVar is specified inside vhost.

Ported from r591985 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596407&r1=596406&r2=596407&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 Mon Nov 19 11:44:47 
2007
@@ -633,7 +633,7 @@
 s->ssl_session = NULL;
 s->ssl_key_size = -1;   /* required by Servlet 2.3 Api, added in jtc */
 
-if (conf->ssl_enable || conf->envvars_in_use) {
+if (conf->ssl_enable || conf->envvars) {
 ap_add_common_vars(r);
 
 if (conf->ssl_enable) {
@@ -693,7 +693,7 @@
 }
 }
 
-if (conf->envvars_in_use) {
+if (conf->envvars) {
 const array_header *t = conf->envvar_items;
 if (t && t->nelts) {
 int i;
@@ -1781,6 +1781,12 @@
   &jk_module);
 
 conf->envvars_in_use = JK_TRUE;
+if (!conf->envvars) {
+conf->envvars  = ap_make_table(cmd->pool, 0);
+conf->envvars_def  = ap_make_table(cmd->pool, 0);
+conf->envvar_items = ap_make_array(cmd->pool, 0,
+   sizeof(envvar_item));
+}
 
 /* env_name is mandatory, default_value is optional.
  * No value means send the attribute only, if the env var is set during 
runtime.
@@ -2243,9 +2249,11 @@
 c->uw_map = NULL;
 
 c->envvars_in_use = JK_FALSE;
-c->envvars = ap_make_table(p, 0);
-c->envvars_def = ap_make_table(p, 0);
-c->envvar_items = ap_make_array(p, 0, sizeof(envvar_item));
+if (!s->is_virtual) {
+c->envvars = ap_make_table(p, 0);
+c->envvars_def = ap_make_table(p, 0);
+c->envvar_items = ap_make_array(p, 0, sizeof(envvar_item));
+}
 
 c->s = s;
 
@@ -2308,16 +2316,16 @@
 
 overrides->options |= (base->options & ~base->exclude_options);
 
-if (base->envvars_in_use) {
-
-if (ap_table_elts(base->envvars)) {
-overrides->envvars_in_use = JK_TRUE;
+if (base->envvars) {
+if (overrides->envvars && overrides->envvars_in_use) {
 merge_apr_table(base->envvars, overrides->envvars);
-}
-if (ap_table_elts(base->envvars_def)) {
-overrides->envvars_in_use = JK_TRUE;
 merge_apr_table(base->envvars_def, overrides->envvars_def);
 }
+else {
+overrides->envvars = base->envvars;
+overrides->envvars_def = base->envvars_def;
+overrides->envvar_items = base->envvar_items;
+}
 }
 
 if (overrides->mount_file_reload == JK_UNSET)
@@ -2524,7 +2532,7 @@
 ap_log_error(APLOG_MARK, APLOG_ERR, srv,
  "JkRequestLogFormat format array NULL");
 }
-if (sconf->envvars_in_use) {
+if (sconf->envvars && sconf->envvars_in_use) {
 int i;
 const array_header *arr;
 const table_entry *elts;
@@ -2917,10 +2925,14 @@
we can't guarantee what order pools get cleaned
up between APR implementations. */
 wc_close(NULL);
-if (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);
+/* We cannot have allocated uw_map
+ * unless we've allocated uri_to_context
+ */
+if (conf->uw_map)
+uri_worker_map_free(&conf->uw_map, NULL);
+}
 conf->was_initialized = JK_FALSE;
 }
 s = s->next;



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

svn commit: r596408 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 11:47:23 2007
New Revision: 596408

URL: http://svn.apache.org/viewvc?rev=596408&view=rev
Log:
Allocate temporary mount maps on first directive.

Port from r591990 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596408&r1=596407&r2=596408&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 Mon Nov 19 11:47:23 
2007
@@ -870,6 +870,11 @@
 if (c[0] != '/')
 return "JkMount context should start with /";
 
+if (!conf->uri_to_context) {
+if (!jk_map_alloc(&(conf->uri_to_context))) {
+return "JkMount Memory error";
+}
+}
 /*
  * Add the new worker to the alias map.
  */
@@ -912,6 +917,12 @@
 if (c[0] != '/')
 return "JkUnMount context should start with /";
 uri = ap_pstrcat(cmd->temp_pool, "!", c, NULL);
+
+if (!conf->uri_to_context) {
+if (!jk_map_alloc(&(conf->uri_to_context))) {
+return "JkUnMount Memory error";
+}
+}
 /*
  * Add the new worker to the alias map.
  */



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

svn commit: r596409 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 11:49:11 2007
New Revision: 596409

URL: http://svn.apache.org/viewvc?rev=596409&view=rev
Log:
Do not allocate envvar maps on create. They are allocated on first use.

Port from r591995 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596409&r1=596408&r2=596409&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 Mon Nov 19 11:49:11 
2007
@@ -2260,11 +2260,9 @@
 c->uw_map = NULL;
 
 c->envvars_in_use = JK_FALSE;
-if (!s->is_virtual) {
-c->envvars = ap_make_table(p, 0);
-c->envvars_def = ap_make_table(p, 0);
-c->envvar_items = ap_make_array(p, 0, sizeof(envvar_item));
-}
+c->envvars = NULL;
+c->envvars_def = NULL;
+c->envvar_items = NULL;
 
 c->s = s;
 



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

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

[rjung]

Author: rjung
Date: Mon Nov 19 11:50:23 2007
New Revision: 596410

URL: http://svn.apache.org/viewvc?rev=596410&view=rev
Log:
Remove trailing spaces, no functional change.

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=596410&r1=596409&r2=596410&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 Mon Nov 19 11:50:23 
2007
@@ -873,7 +873,7 @@
 if (!conf->uri_to_context) {
 if (!jk_map_alloc(&(conf->uri_to_context))) {
 return "JkMount Memory error";
-}
+}
 }
 /*
  * Add the new worker to the alias map.
@@ -921,7 +921,7 @@
 if (!conf->uri_to_context) {
 if (!jk_map_alloc(&(conf->uri_to_context))) {
 return "JkUnMount Memory error";
-}
+}
 }
 /*
  * Add the new worker to the alias map.

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=596410&r1=596409&r2=596410&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 Mon Nov 19 11:50:23 
2007
@@ -2458,7 +2458,7 @@
 }
 }
 
-   if (overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE) { 
   
+   if (overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE) {
overrides->mountcopy = JK_TRUE;
}
if (overrides->uri_to_context && overrides->mountcopy == JK_TRUE) {



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

svn commit: r596417 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 12:00:09 2007
New Revision: 596417

URL: http://svn.apache.org/viewvc?rev=596417&view=rev
Log:
Initialize and allocate uw_map on first directive. Do not allocate on 
JkMountCopy if
no additional maps are present.

Port from r593462 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596417&r1=596416&r2=596417&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 Mon Nov 19 12:00:09 
2007
@@ -992,6 +992,12 @@
 if (stat(conf->mount_file, &statbuf) == -1)
 return "Can't find the mount file specified";
 
+if (!conf->uri_to_context) {
+if (!jk_map_alloc(&(conf->uri_to_context))) {
+return "JkMountFile Memory error";
+}
+}
+
 return NULL;
 }
 
@@ -2254,9 +2260,7 @@
 c->strip_session = JK_FALSE;
 }
 
-if (!jk_map_alloc(&(c->uri_to_context))) {
-jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
-}
+c->uri_to_context = NULL;
 c->uw_map = NULL;
 
 c->envvars_in_use = JK_FALSE;
@@ -2337,13 +2341,12 @@
 }
 }
 
-if (overrides->mount_file_reload == JK_UNSET)
-overrides->mount_file_reload = base->mount_file_reload;
-if (overrides->mountcopy == JK_TRUE ||
-(overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE)) {
+   if (overrides->uri_to_context) {
 if (jk_map_copy(base->uri_to_context, overrides->uri_to_context) == 
JK_FALSE) {
 jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, p, 
"Memory error");
 }
+if (overrides->mount_file_reload == JK_UNSET)
+overrides->mount_file_reload = base->mount_file_reload;
 if (!overrides->mount_file)
 overrides->mount_file = base->mount_file;
 if (!overrides->alias_dir)
@@ -2511,28 +2514,36 @@
  * Therefore we check, if this config structure really belongs to this
  * vhost, otherwise we create a new one and merge.
  */
-if (sconf && sconf->s != srv && jk_mount_copy_all == JK_FALSE) {
+if (sconf && sconf->s != srv) {
 jk_server_conf_t *srvconf = (jk_server_conf_t 
*)create_jk_config(p, srv);
 sconf = (jk_server_conf_t *)merge_jk_config(p, sconf, srvconf);
 ap_set_module_config(srv->module_config, &jk_module, 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))
-jk_error_exit(APLOG_MARK, APLOG_EMERG, srv,
-  p, "Memory error");
-if (sconf->options & JK_OPT_REJECTUNSAFE)
-sconf->uw_map->reject_unsafe = 1;
-else
-sconf->uw_map->reject_unsafe = 0;
-if (sconf->mount_file) {
-sconf->uw_map->fname = sconf->mount_file;
-sconf->uw_map->reload = sconf->mount_file_reload;
-uri_worker_map_load(sconf->uw_map, sconf->log);
+if (sconf->uri_to_context) {
+if (!uri_worker_map_alloc(&(sconf->uw_map),
+  sconf->uri_to_context, sconf->log))
+jk_error_exit(APLOG_MARK, APLOG_EMERG, srv,
+  p, "Memory error");
+if (sconf->options & JK_OPT_REJECTUNSAFE)
+sconf->uw_map->reject_unsafe = 1;
+else
+sconf->uw_map->reject_unsafe = 0;
+if (sconf->mount_file) {
+sconf->uw_map->fname = sconf->mount_file;
+sconf->uw_map->reload = sconf->mount_file_reload;
+uri_worker_map_load(sconf->uw_map, sconf->log);
+}
+}
+else {
+if (sconf->mountcopy == JK_TRUE || jk_mount_copy_all == 
JK_TRUE) {
+sconf->uw_map = conf->uw_map;
+}
 }
 if (sconf->format_string) {
 sconf->format =



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

svn commit: r596419 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 12:03:11 2007
New Revision: 596419

URL: http://svn.apache.org/viewvc?rev=596419&view=rev
Log:
Not sure why we set to NULL or zero something that was already set to zero.

Port form r593493 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596419&r1=596418&r2=596419&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 Mon Nov 19 12:03:11 
2007
@@ -2210,31 +2210,15 @@
 jk_server_conf_t *c =
 (jk_server_conf_t *) ap_pcalloc(p, sizeof(jk_server_conf_t));
 
-c->mount_file = NULL;
-c->log_file = NULL;
 c->log_fd = -1;
-c->log = NULL;
-c->alias_dir = NULL;
-c->stamp_format_string = NULL;
-c->format_string = NULL;
-c->format = NULL;
 c->mountcopy = JK_FALSE;
-c->exclude_options = 0;
 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;
-c->worker_indicator = NULL;
 c->ssl_enable = JK_UNSET;
-c->https_indicator = NULL;
-c->certs_indicator = NULL;
-c->cipher_indicator = NULL;
-c->certchain_prefix = NULL;
-c->session_indicator = NULL;
-c->key_size_indicator = NULL;
 c->strip_session = JK_UNSET;
 } else {
 c->mountcopy = JK_FALSE;
@@ -2259,14 +2243,7 @@
 c->key_size_indicator = JK_ENV_KEY_SIZE;
 c->strip_session = JK_FALSE;
 }
-
-c->uri_to_context = NULL;
-c->uw_map = NULL;
-
 c->envvars_in_use = JK_FALSE;
-c->envvars = NULL;
-c->envvars_def = NULL;
-c->envvar_items = NULL;
 
 c->s = s;
 



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

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

[rjung]

Author: rjung
Date: Mon Nov 19 12:13:18 2007
New Revision: 596421

URL: http://svn.apache.org/viewvc?rev=596421&view=rev
Log:
Enhance r593497: debug log if no match was found, even if we do strip session.

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=596421&r1=596420&r2=596421&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 Mon Nov 19 12:13:18 
2007
@@ -3123,30 +3123,30 @@
 apr_table_setn(r->main->notes, JK_NOTE_WORKER_NAME, 
worker);
 
 }
-else if (conf->strip_session == JK_TRUE) {
-char *jsessionid;
-if (r->uri) {
-jsessionid = strstr(r->uri, JK_PATH_SESSION_IDENTIFIER);
-if (jsessionid) {
-if (JK_IS_DEBUG_LEVEL(conf->log))
-jk_log(conf->log, JK_LOG_DEBUG,
-   "removing session identifier [%s] for non 
servlet url [%s]",
-   jsessionid, r->uri);
-*jsessionid = '\0';
-}
-}
-if (r->filename) {
-jsessionid = strstr(r->filename, 
JK_PATH_SESSION_IDENTIFIER);
-if (jsessionid)
-*jsessionid = '\0';
-}
-return DECLINED;
-}
 else {
 if (JK_IS_DEBUG_LEVEL(conf->log))
 jk_log(conf->log, JK_LOG_DEBUG,
"no match for %s found",
r->uri);
+if (conf->strip_session == JK_TRUE) {
+char *jsessionid;
+if (r->uri) {
+jsessionid = strstr(r->uri, 
JK_PATH_SESSION_IDENTIFIER);
+if (jsessionid) {
+if (JK_IS_DEBUG_LEVEL(conf->log))
+jk_log(conf->log, JK_LOG_DEBUG,
+   "removing session identifier [%s] for 
non servlet url [%s]",
+   jsessionid, r->uri);
+*jsessionid = '\0';
+}
+}
+if (r->filename) {
+jsessionid = strstr(r->filename, 
JK_PATH_SESSION_IDENTIFIER);
+if (jsessionid)
+*jsessionid = '\0';
+}
+return DECLINED;
+}
 }
 }
 }



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

svn commit: r596422 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 12:15:04 2007
New Revision: 596422

URL: http://svn.apache.org/viewvc?rev=596422&view=rev
Log:
Log no match case.

Port from r593497 and r596421 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596422&r1=596421&r2=596422&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 Mon Nov 19 12:15:04 
2007
@@ -16,12 +16,12 @@
  */
 
 /***
- * Description: Apache 1.3 plugin for Tomcat*
+ * Description: Apache 1.3 plugin for Tomcat   *
  *  See ../common/jk_service.h for general mod_jk info *
  * Author:  Gal Shachor <[EMAIL PROTECTED]>   *
  *  Dan Milstein <[EMAIL PROTECTED]>*
  *  Henri Gomez <[EMAIL PROTECTED]>*
- * Version: $Revision$  *
+ * Version: $Revision$*
  ***/
 
 /*
@@ -2773,22 +2773,28 @@
 }
 }
 }
-else if (conf->strip_session == JK_TRUE) {
-char *jsessionid;
-if (r->uri) {
-jsessionid = strstr(r->uri, JK_PATH_SESSION_IDENTIFIER);
-if (jsessionid) {
-if (JK_IS_DEBUG_LEVEL(conf->log))
-jk_log(conf->log, JK_LOG_DEBUG,
-   "removing session identifier [%s] for non 
servlet url [%s]",
-   jsessionid, r->uri);
-*jsessionid = '\0';
+else {
+if (JK_IS_DEBUG_LEVEL(conf->log))
+jk_log(conf->log, JK_LOG_DEBUG,
+   "no match for %s found",
+   r->uri);
+if (conf->strip_session == JK_TRUE) {
+char *jsessionid;
+if (r->uri) {
+jsessionid = strstr(r->uri, 
JK_PATH_SESSION_IDENTIFIER);
+if (jsessionid) {
+if (JK_IS_DEBUG_LEVEL(conf->log))
+jk_log(conf->log, JK_LOG_DEBUG,
+   "removing session identifier [%s] for 
non servlet url [%s]",
+   jsessionid, r->uri);
+*jsessionid = '\0';
+}
+}
+if (r->filename) {
+jsessionid = strstr(r->filename, 
JK_PATH_SESSION_IDENTIFIER);
+if (jsessionid)
+*jsessionid = '\0';
 }
-}
-if (r->filename) {
-jsessionid = strstr(r->filename, 
JK_PATH_SESSION_IDENTIFIER);
-if (jsessionid)
-*jsessionid = '\0';
 }
 }
 }



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

svn commit: r596423 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 12:16:47 2007
New Revision: 596423

URL: http://svn.apache.org/viewvc?rev=596423&view=rev
Log:
Rename envvars_in_use to envvars_has_own reflecting better
it's new use. It indicates, if the envvars are completely
inherited from another vhost, or if the vhost has at least
one envvar which is special for it.

Port from r593915 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596423&r1=596422&r2=596423&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 Mon Nov 19 12:16:47 
2007
@@ -179,7 +179,7 @@
 /*
  * Environment variables support
  */
-int envvars_in_use;
+int envvars_has_own;
 table *envvars;
 table *envvars_def;
 array_header *envvar_items;
@@ -1797,7 +1797,7 @@
 (jk_server_conf_t *) ap_get_module_config(s->module_config,
   &jk_module);
 
-conf->envvars_in_use = JK_TRUE;
+conf->envvars_has_own = JK_TRUE;
 if (!conf->envvars) {
 conf->envvars  = ap_make_table(cmd->pool, 0);
 conf->envvars_def  = ap_make_table(cmd->pool, 0);
@@ -2243,7 +2243,7 @@
 c->key_size_indicator = JK_ENV_KEY_SIZE;
 c->strip_session = JK_FALSE;
 }
-c->envvars_in_use = JK_FALSE;
+c->envvars_has_own = JK_FALSE;
 
 c->s = s;
 
@@ -2307,7 +2307,7 @@
 overrides->options |= (base->options & ~base->exclude_options);
 
 if (base->envvars) {
-if (overrides->envvars && overrides->envvars_in_use) {
+if (overrides->envvars && overrides->envvars_has_own) {
 merge_apr_table(base->envvars, overrides->envvars);
 merge_apr_table(base->envvars_def, overrides->envvars_def);
 }
@@ -2529,7 +2529,7 @@
 ap_log_error(APLOG_MARK, APLOG_ERR, srv,
  "JkRequestLogFormat format array NULL");
 }
-if (sconf->envvars && sconf->envvars_in_use) {
+if (sconf->envvars && sconf->envvars_has_own) {
 int i;
 const array_header *arr;
 const table_entry *elts;



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

svn commit: r596426 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 12:18:55 2007
New Revision: 596426

URL: http://svn.apache.org/viewvc?rev=596426&view=rev
Log:
Add two comments, how me merge.

Port from r593916 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596426&r1=596425&r2=596426&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 Mon Nov 19 12:18:55 
2007
@@ -2308,6 +2308,7 @@
 
 if (base->envvars) {
 if (overrides->envvars && overrides->envvars_has_own) {
+/* merge_apr_table() preserves existing entries in overrides table */
 merge_apr_table(base->envvars, overrides->envvars);
 merge_apr_table(base->envvars_def, overrides->envvars_def);
 }
@@ -2319,6 +2320,7 @@
 }
 
if (overrides->uri_to_context) {
+/* jk_map_copy() preserves existing entries in overrides map */
 if (jk_map_copy(base->uri_to_context, overrides->uri_to_context) == 
JK_FALSE) {
 jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, p, 
"Memory error");
 }



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

svn commit: r596429 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 12:22:49 2007
New Revision: 596429

URL: http://svn.apache.org/viewvc?rev=596429&view=rev
Log:
We should always have a non-NULL mapping table
in the main server. Otherwise e.g. we get a core dump,
when using the mount attribute in workers.properties.

Port from r593918 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596429&r1=596428&r2=596429&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 Mon Nov 19 12:22:49 
2007
@@ -2221,6 +2221,9 @@
 c->ssl_enable = JK_UNSET;
 c->strip_session = JK_UNSET;
 } else {
+if (!jk_map_alloc(&(c->uri_to_context))) {
+ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, NULL, "Memory 
error");
+}
 c->mountcopy = JK_FALSE;
 c->mount_file_reload = JK_URIMAP_DEF_RELOAD;
 c->log_level = JK_LOG_DEF_LEVEL;



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

svn commit: r596433 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 12:26:02 2007
New Revision: 596433

URL: http://svn.apache.org/viewvc?rev=596433&view=rev
Log:
Merge is always done before post_config, so we
can use jk_mount_copy_all to set mountcopy during merge,
which simplifies mount copy logic.

JkMountCopy All should be weaker than JkMountCopy Off,
i.e. a vhost with JkMountCopy Off should not inherit
the mounts, even if JkMountCopy All is globally set.

Port from r593921 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596433&r1=596432&r2=596433&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 Mon Nov 19 12:26:02 
2007
@@ -2322,6 +2322,9 @@
 }
 }
 
+   if (overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE) {
+   overrides->mountcopy = JK_TRUE;
+   }
if (overrides->uri_to_context) {
 /* jk_map_copy() preserves existing entries in overrides map */
 if (jk_map_copy(base->uri_to_context, overrides->uri_to_context) == 
JK_FALSE) {
@@ -2523,7 +2526,7 @@
 }
 }
 else {
-if (sconf->mountcopy == JK_TRUE || jk_mount_copy_all == 
JK_TRUE) {
+if (sconf->mountcopy == JK_TRUE) {
 sconf->uw_map = conf->uw_map;
 }
 }



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

svn commit: r596435 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rjung]

Author: rjung
Date: Mon Nov 19 12:28:13 2007
New Revision: 596435

URL: http://svn.apache.org/viewvc?rev=596435&view=rev
Log:
Even if a vhost has private JkMounts, it should not always
inherit the mounts from the global server. Only inherit
if JkMountCopy indicates it.

Port from r593922 of apache-2.0/mod_jk.c.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/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=596435&r1=596434&r2=596435&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 Mon Nov 19 12:28:13 
2007
@@ -2325,18 +2325,18 @@
if (overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE) {
overrides->mountcopy = JK_TRUE;
}
-   if (overrides->uri_to_context) {
+   if (overrides->uri_to_context && overrides->mountcopy == JK_TRUE) {
 /* jk_map_copy() preserves existing entries in overrides map */
 if (jk_map_copy(base->uri_to_context, overrides->uri_to_context) == 
JK_FALSE) {
 jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, p, 
"Memory error");
 }
-if (overrides->mount_file_reload == JK_UNSET)
-overrides->mount_file_reload = base->mount_file_reload;
 if (!overrides->mount_file)
 overrides->mount_file = base->mount_file;
 if (!overrides->alias_dir)
 overrides->alias_dir = base->alias_dir;
 }
+if (overrides->mount_file_reload == JK_UNSET)
+overrides->mount_file_reload = base->mount_file_reload;
 if (overrides->strip_session == JK_UNSET)
 overrides->strip_session = base->strip_session;
 



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

svn commit: r596458 - /tomcat/tc6.0.x/trunk/STATUS.txt

[pero]

Author: pero
Date: Mon Nov 19 13:31:50 2007
New Revision: 596458

URL: http://svn.apache.org/viewvc?rev=596458&view=rev
Log:
Add my vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=596458&r1=596457&r2=596458&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 19 13:31:50 2007
@@ -28,7 +28,7 @@
 
 * Fix BZ 43588 - hard coded 127.0.0.1 for localhost
   http://people.apache.org/~jim/patches/tc-localhost.txt
-  +1: jim
+  +1: jim, pero
   -1: 
 
 * Add tests for the cookie parsing.
@@ -42,7 +42,7 @@
   Add in non blocking request header parsing
   This is a port of improvements from the old trunk and fixes the BZ above and 
improves greatly on the NIO connector
   http://people.apache.org/~fhanik/patches/fix-nio-blocking-output.patch
-  +1: fhanik, jim
+  +1: fhanik, jim, pero
   -1: 
   
 * Fix Comet bug, if servlet calls cometEvent.close() on the BEGIN event, the 
request still is marked as comet and ends up in a funky state



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

DO NOT REPLY [Bug 43908] New: - server attribute of Connector tag in server.xml not working

[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=43908

   Summary: server attribute of Connector tag in server.xml not
working
   Product: Tomcat 4
   Version: 4.1.31
  Platform: Other
OS/Version: other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connector:Coyote HTTP/1.1
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


The server attribute of the Connector tag in server.xml does not have its 
desired functionality in 4.1.31.  This was repaired by the time 4.1.36 was 
released, but un-upgraded versions will not have this attribute working.

-- 
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: r596470 - /tomcat/tc6.0.x/trunk/STATUS.txt

[fhanik]

Author: fhanik
Date: Mon Nov 19 14:36:38 2007
New Revision: 596470

URL: http://svn.apache.org/viewvc?rev=596470&view=rev
Log:
cast vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=596470&r1=596469&r2=596470&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 19 14:36:38 2007
@@ -28,7 +28,7 @@
 
 * Fix BZ 43588 - hard coded 127.0.0.1 for localhost
   http://people.apache.org/~jim/patches/tc-localhost.txt
-  +1: jim, pero
+  +1: jim, pero, fhanik
   -1: 
 
 * Add tests for the cookie parsing.



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

svn commit: r596473 - in /tomcat/trunk/java/org/apache: catalina/servlets/WebdavServlet.java naming/resources/ProxyDirContext.java

[markt]

Author: markt
Date: Mon Nov 19 14:49:15 2007
New Revision: 596473

URL: http://svn.apache.org/viewvc?rev=596473&view=rev
Log:
Code cleanup. Fix warnings in webdav servlet. No functional change.

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=596473&r1=596472&r2=596473&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Mon Nov 
19 14:49:15 2007
@@ -80,7 +80,6 @@
 // -- Constants
 
 
-private static final String METHOD_HEAD = "HEAD";
 private static final String METHOD_PROPFIND = "PROPFIND";
 private static final String METHOD_PROPPATCH = "PROPPATCH";
 private static final String METHOD_MKCOL = "MKCOL";
@@ -490,10 +489,10 @@
 int slash = path.lastIndexOf('/');
 if (slash != -1) {
 String parentPath = path.substring(0, slash);
-Vector currentLockNullResources =
-(Vector) lockNullResources.get(parentPath);
+Vector currentLockNullResources =
+lockNullResources.get(parentPath);
 if (currentLockNullResources != null) {
-Enumeration lockNullResourcesList =
+Enumeration lockNullResourcesList =
 currentLockNullResources.elements();
 while (lockNullResourcesList.hasMoreElements()) {
 String lockNullPath = (String)
@@ -565,7 +564,8 @@
 if ((object instanceof DirContext) && (depth > 0)) {
 
 try {
-NamingEnumeration enumeration = 
resources.list(currentPath);
+NamingEnumeration enumeration =
+resources.list(currentPath);
 while (enumeration.hasMoreElements()) {
 NameClassPair ncPair =
 (NameClassPair) enumeration.nextElement();
@@ -588,10 +588,10 @@
 if (lockPath.endsWith("/"))
 lockPath =
 lockPath.substring(0, lockPath.length() - 1);
-Vector currentLockNullResources =
-(Vector) lockNullResources.get(lockPath);
+Vector currentLockNullResources =
+lockNullResources.get(lockPath);
 if (currentLockNullResources != null) {
-Enumeration lockNullResourcesList =
+Enumeration lockNullResourcesList =
 currentLockNullResources.elements();
 while (lockNullResourcesList.hasMoreElements()) {
 String lockNullPath = (String)
@@ -670,9 +670,8 @@
 }
 
 boolean exists = true;
-Object object = null;
 try {
-object = resources.lookup(path);
+resources.lookup(path);
 } catch (NamingException e) {
 exists = false;
 }
@@ -693,8 +692,8 @@
 if (req.getInputStream().available() > 0) {
 DocumentBuilder documentBuilder = getDocumentBuilder();
 try {
-Document document = documentBuilder.parse
-(new InputSource(req.getInputStream()));
+// Document document =
+documentBuilder.parse(new InputSource(req.getInputStream()));
 // TODO : Process this request body
 resp.sendError(WebdavStatus.SC_NOT_IMPLEMENTED);
 return;
@@ -1037,7 +1036,7 @@
 exists = false;
 }
 
-Enumeration locksList = null;
+Enumeration locksList = null;
 
 if (lockRequestType == LOCK_CREATION) {
 
@@ -1092,7 +1091,7 @@
 // One of the child paths was locked
 // We generate a multistatus error report
 
-Enumeration lockPathsList = lockPaths.elements();
+Enumeration lockPathsList = lockPaths.elements();
 
 resp.setStatus(WebdavStatus.SC_CONFLICT);
 
@@ -1233,7 +1232,7 @@
 // Checking resource locks
 
 LockInfo toRenew = (LockInfo) resourceLocks.get(path);
-Enumeration tokenList = null;
+Enumeration tokenList = null;
 if (lock != null) {
 
 // At least one of the tokens of the locks must have been given
@@ -1251,7 +1250,8 @@
 
 // Checking inheritable collection

DO NOT REPLY [Bug 43908] - server attribute of Connector tag in server.xml not working

[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=43908


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-11-19 14:50 ---
Closing since the description state sit has already been fixed in 4.1.36.

-- 
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 43893] - WebDAV servlet returns incorrect values for the "href" property

[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=43893





--- Additional Comments From [EMAIL PROTECTED]  2007-11-19 15:29 ---
There are a few subtle differences if you map to '/' rather than '/*'. There
might other slight difference is you map to /edit/*. I'll work on getting these
fixed.

The patch you suggests breaks the ability to have different urls for editing and
viewing by mapping to /edit/* or similar.

I am unable to reproduce the duplicate file name you show in your report. I'm
not sure why. I also don't get the ,  and
 tags. Could you confirm this result with your provided test case?

Thanks,

Mark

-- 
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: r596489 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardWrapperValve.java webapps/docs/changelog.xml

[fhanik]

Author: fhanik
Date: Mon Nov 19 15:38:40 2007
New Revision: 596489

URL: http://svn.apache.org/viewvc?rev=596489&view=rev
Log:
Fix Comet bug when CometEvent.close called during begin event

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=596489&r1=596488&r2=596489&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 19 15:38:40 2007
@@ -35,8 +35,3 @@
   http://people.apache.org/~jfclere/patches/test_cookies.patch
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match 
the dir structure
-  
-* Fix Comet bug, if servlet calls cometEvent.close() on the BEGIN event, the 
request still is marked as comet and ends up in a funky state
-  http://people.apache.org/~fhanik/patches/comet-begin-event-close.patch
-  +1: fhanik, markt, pero, jim
-  -1: 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=596489&r1=596488&r2=596489&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
Mon Nov 19 15:38:40 2007
@@ -227,8 +227,8 @@
 }
 } else {
 if (comet) {
-filterChain.doFilterEvent(request.getEvent());
 request.setComet(true);
+filterChain.doFilterEvent(request.getEvent());
 } else {
 filterChain.doFilter
 (request.getRequest(), response.getResponse());

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=596489&r1=596488&r2=596489&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Nov 19 15:38:40 2007
@@ -35,6 +35,9 @@
 
   
 
+  
+Fix handling of CometEvent.close when called during BEGIN event 
(fhanik)
+  
   43846
 Fix block simulated read and writes causing timeouts.
 Add non blocking parsing of HTTP request headers.



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

DO NOT REPLY [Bug 43846] - Race condition with NIO connector parsing chunked response

[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=43846


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-11-19 20:19 ---
Patch has been added to 6.0.x and will go out with 6.0.16 next release.
Thanks for the feedback.


-- 
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: r596549 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java

[markt]

Author: markt
Date: Mon Nov 19 22:34:19 2007
New Revision: 596549

URL: http://svn.apache.org/viewvc?rev=596549&view=rev
Log:
Fix properties

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java   
(contents, props changed)

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java?rev=596549&r1=596548&r2=596549&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java Mon 
Nov 19 22:34:19 2007
@@ -1,29 +1,29 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.tomcat.util;
-
-public class MutableInteger {
-protected int value = 0;
-public MutableInteger() {}
-public MutableInteger(int val) {
-this.value = val;
-}
-
-public int get() { return value;}
-public void set(int val) {this.value = val;}
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.tomcat.util;
+
+public class MutableInteger {
+protected int value = 0;
+public MutableInteger() {}
+public MutableInteger(int val) {
+this.value = val;
+}
+
+public int get() { return value;}
+public void set(int val) {this.value = val;}
+}

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java
--
svn:eol-style = native

Propchange: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java
--
svn:keywords = Author Date Id Revision



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

svn commit: r596550 - /tomcat/trunk/java/org/apache/tomcat/util/MutableInteger.java

[markt]

Author: markt
Date: Mon Nov 19 22:34:36 2007
New Revision: 596550

URL: http://svn.apache.org/viewvc?rev=596550&view=rev
Log:
Fix properties

Modified:
tomcat/trunk/java/org/apache/tomcat/util/MutableInteger.java   (contents, 
props changed)

Modified: tomcat/trunk/java/org/apache/tomcat/util/MutableInteger.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/MutableInteger.java?rev=596550&r1=596549&r2=596550&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/MutableInteger.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/MutableInteger.java Mon Nov 19 
22:34:36 2007
@@ -1,29 +1,29 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.tomcat.util;
-
-public class MutableInteger {
-protected int value = 0;
-public MutableInteger() {}
-public MutableInteger(int val) {
-this.value = val;
-}
-
-public int get() { return value;}
-public void set(int val) {this.value = val;}
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.tomcat.util;
+
+public class MutableInteger {
+protected int value = 0;
+public MutableInteger() {}
+public MutableInteger(int val) {
+this.value = val;
+}
+
+public int get() { return value;}
+public void set(int val) {this.value = val;}
+}

Propchange: tomcat/trunk/java/org/apache/tomcat/util/MutableInteger.java
--
svn:eol-style = native

Propchange: tomcat/trunk/java/org/apache/tomcat/util/MutableInteger.java
--
svn:keywords = Author Date Id Revision



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

DO NOT REPLY [Bug 43909] New: - EL EvaluationContext wrapper hides locale

[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=43909

   Summary: EL EvaluationContext wrapper hides locale
   Product: Tomcat 6
   Version: 6.0.14
  Platform: Other
OS/Version: other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


org.apache.el.lang.EvaluationContext doesn't pass locale to the wrapped
ELContext as does org.apache.jasper.el.ELContextWrapper. This prohibits using of
the locale for it's original purpose.

-- 
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 43909] - EL EvaluationContext wrapper hides locale

[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=43909





--- Additional Comments From [EMAIL PROTECTED]  2007-11-19 23:26 ---
Created an attachment (id=21157)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=21157&action=view)
proper locale wrapping

Here's a small patch to fix the problem but it would be more appropriate to
extract pure wrapper pattern implementation as it's own class.

-- 
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]