cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c
mturk 2005/02/21 00:24:08 Modified:jk/native/common jk_status.c Log: Be more informant when displaying uri maps. Revision ChangesPath 1.22 +7 -3 jakarta-tomcat-connectors/jk/native/common/jk_status.c Index: jk_status.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jk_status.c 20 Feb 2005 18:31:21 - 1.21 +++ jk_status.c 21 Feb 2005 08:24:08 - 1.22 @@ -324,15 +324,19 @@ unsigned int i; jk_puts(s, br /Uri Mappings:\n); -jk_puts(s, tabletrthMatch Type/ththUri/th/tr\n); +jk_puts(s, table\ntrthMatch Type/ththUri/th + thContext/ththSuffix/th/tr\n); for (i = 0; i uwmap-size; i++) { uri_worker_record_t *uwr = uwmap-maps[i]; -if (strcmp(uwr-worker_name, worker)) +if (strcmp(uwr-worker_name, worker)) { continue; +} jk_putv(s, trtd, status_val_match(uwr-match_type), /tdtd, NULL); jk_puts(s, uwr-uri); +jk_putv(s, /tdtd, uwr-context, NULL); +jk_putv(s, /tdtd, uwr-suffix, NULL); jk_puts(s, /td/tr\n); } jk_puts(s, /table\n); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_map.c jk_map.h
mturk 2005/02/21 00:25:33 Modified:jk/native/common jk_map.c jk_map.h Log: Return modification time to the caller. Do not set directly to shmem because we can open any property file not just workers.properties. Revision ChangesPath 1.30 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_map.c Index: jk_map.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- jk_map.c 20 Feb 2005 12:19:17 - 1.29 +++ jk_map.c 21 Feb 2005 08:25:33 - 1.30 @@ -400,7 +400,7 @@ } -int jk_map_read_properties(jk_map_t *m, const char *f) +int jk_map_read_properties(jk_map_t *m, const char *f, time_t *modified) { int rc = JK_FALSE; @@ -427,8 +427,8 @@ break; } fclose(fp); -/* Update shared memory */ -jk_shm_set_workers_time(statbuf.st_mtime); +if (modified) +*modified = statbuf.st_mtime; } } 1.16 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_map.h Index: jk_map.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_map.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jk_map.h 20 Feb 2005 12:19:17 - 1.15 +++ jk_map.h 21 Feb 2005 08:25:33 - 1.16 @@ -61,7 +61,7 @@ int jk_map_read_property(jk_map_t *m, const char *str); -int jk_map_read_properties(jk_map_t *m, const char *f); +int jk_map_read_properties(jk_map_t *m, const char *f, time_t *modified); int jk_map_size(jk_map_t *m); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_uri_worker_map.c jk_uri_worker_map.h
mturk 2005/02/21 00:27:13 Modified:jk/native/common jk_uri_worker_map.c jk_uri_worker_map.h Log: Add functions for dynamic loading of uriworkermap files. Default interval is 60 s. If file is modified then reload its content and update uri mappings. Revision ChangesPath 1.49 +93 -11 jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c Index: jk_uri_worker_map.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- jk_uri_worker_map.c 20 Feb 2005 18:31:21 - 1.48 +++ jk_uri_worker_map.c 21 Feb 2005 08:27:13 - 1.49 @@ -24,6 +24,8 @@ #include jk_pool.h #include jk_util.h +#include jk_map.h +#include jk_mt.h #include jk_uri_worker_map.h #ifdef WIN32 @@ -135,10 +137,19 @@ JK_TRACE_ENTER(l); if (init_data uw_map) { -int rc = uri_worker_map_open(*uw_map = - (jk_uri_worker_map_t *) - malloc(sizeof(jk_uri_worker_map_t)), - init_data, l); +int rc; +*uw_map = (jk_uri_worker_map_t *)calloc(1, sizeof(jk_uri_worker_map_t)); + +JK_INIT_CS(((*uw_map)-cs), rc); +if (rc == JK_FALSE) { +jk_log(l, JK_LOG_ERROR, + creating thread lock errno=%d, + errno); +JK_TRACE_EXIT(l); +return JK_FALSE; +} + +rc = uri_worker_map_open(*uw_map, init_data, l); JK_TRACE_EXIT(l); return rc; } @@ -154,6 +165,8 @@ JK_TRACE_ENTER(l); if (uw_map) { +int i; +JK_DELETE_CS((uw_map-cs), i); jk_close_pool(uw_map-p); JK_TRACE_EXIT(l); return JK_TRUE; @@ -225,8 +238,16 @@ JK_TRACE_ENTER(l); +if (*puri == '-') { +/* Disable urimap. + * This way you can disable already mounted + * context. + */ +match_type = MATCH_TYPE_DISABLED; +puri++; +} if (*puri == '!') { -match_type = MATCH_TYPE_NO_MATCH; +match_type |= MATCH_TYPE_NO_MATCH; puri++; } @@ -234,6 +255,11 @@ for (i = 0; i uw_map-size; i++) { uwr = uw_map-maps[i]; if (strcmp(uwr-uri, puri) == 0) { +/* Update disabled flag */ +if (match_type MATCH_TYPE_DISABLED) +uwr-match_type |= MATCH_TYPE_DISABLED; +else +uwr-match_type = ~MATCH_TYPE_DISABLED; if (strcmp(uwr-worker_name, worker) == 0) { jk_log(l, JK_LOG_DEBUG, map rule %s=%s already exists, @@ -245,7 +271,7 @@ jk_log(l, JK_LOG_DEBUG, changing map rule %s=%s , puri, worker); -uwr-worker_name = worker; +uwr-worker_name = jk_pool_strdup(uw_map-p, worker); JK_TRACE_EXIT(l); return JK_TRUE; } @@ -366,7 +392,7 @@ exact rule %s=%s was added, uri, worker); } -uwr-worker_name = worker; +uwr-worker_name = jk_pool_strdup(uw_map-p, worker); uwr-context_len = strlen(uwr-context); } else { @@ -640,7 +666,9 @@ */ jk_no2slash(uri); #endif - + +if (uw_map-fname) +uri_worker_map_update(uw_map, l); if (JK_IS_DEBUG_LEVEL(l)) jk_log(l, JK_LOG_DEBUG, Attempting to map URI '%s' from %d maps, uri, uw_map-size); @@ -792,11 +820,65 @@ if (is_nomap_match(uw_map, uri, rv, l)) { if (JK_IS_DEBUG_LEVEL(l)) jk_log(l, JK_LOG_DEBUG, -Denying matching for worker %s by nomatch rule, -rv); + Denying matching for worker %s by nomatch rule, + rv); JK_TRACE_EXIT(l); rv = NULL; } } return rv; } + +int uri_worker_map_load(jk_uri_worker_map_t *uw_map, +jk_logger_t *l) +{ +int rc = JK_FALSE; +jk_map_t *map; + +jk_map_alloc(map); +if (jk_map_read_properties(map, uw_map-fname, + uw_map-modified)) { +int i; +for (i = 0; i jk_map_size(map); i++) { +const char *u = jk_map_name_at(map, i); +const char *w = jk_map_value_at(map, i); +if (!uri_worker_map_add(uw_map, u, w, l)) { +jk_log(l, JK_LOG_ERROR,
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/21 00:29:17 Modified:jk/native/apache-1.3 mod_jk.c jk/native/apache-2.0 mod_jk.c Log: Add JkMountFile directive. This enables to dynamically add or remove uri mappings without restarting apache. To disable uri mapping add a minus '-' sign in front of mapping. Revision ChangesPath 1.71 +52 -3 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- mod_jk.c 17 Feb 2005 15:03:15 - 1.70 +++ mod_jk.c 21 Feb 2005 08:29:17 - 1.71 @@ -95,6 +95,7 @@ */ jk_map_t *worker_properties; char *worker_file; +char *mount_file; jk_map_t *uri_to_context; int mountcopy; @@ -798,6 +799,38 @@ } /* + * JkMountFile Directive Handling + * + * JkMountFile file + */ + +static const char *jk_set_mount_file(cmd_parms * cmd, + void *dummy, char *mount_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); + +/* we need an absolut path (ap_server_root_relative does the ap_pstrdup) */ +conf-mount_file = ap_server_root_relative(cmd-pool, mount_file); + +#ifdef CHROOTED_APACHE +ap_server_strip_chroot(conf-mount_file, 0); +#endif + +if (conf-mount_file == NULL) +return JkMountFile file name invalid; + +if (stat(conf-mount_file, statbuf) == -1) +return Can't find the mount file specified; + +return NULL; +} + +/* * JkLogFile Directive Handling * * JkLogFile file @@ -1519,6 +1552,16 @@ the name of a worker file for the Jakarta servlet containers}, /* + * JkMountFile specifies a full path to the location of the + * uriworker properties file. + * + * This file defines the different mapping for workers used by apache + * to redirect servlet requests. + */ +{JkMountFile, jk_set_mount_file, NULL, RSRC_CONF, TAKE1, + the name of a mount file for the Jakarta servlet uri mappings}, + +/* * JkAutoMount specifies that the list of handled URLs must be * asked to the servlet engine (autoconf feature) */ @@ -1788,6 +1831,7 @@ c-worker_properties = NULL; jk_map_alloc(c-worker_properties); c-worker_file = NULL; +c-mount_file = NULL; c-log_file = NULL; c-log_level = -1; c-log = NULL; @@ -1883,6 +1927,7 @@ copy_jk_map(p, overrides-s, base-uri_to_context, overrides-uri_to_context); copy_jk_map(p, overrides-s, base-automount, overrides-automount); +overrides-mount_file = base-mount_file; } if (base-envvars_in_use) { @@ -1964,7 +2009,7 @@ /*if(map_alloc(init_map)) { */ -if (!jk_map_read_properties(init_map, conf-worker_file)) { +if (!jk_map_read_properties(init_map, conf-worker_file, NULL)) { if (jk_map_size(init_map) == 0) { ap_log_error(APLOG_MARK, APLOG_ERR, NULL, @@ -1984,7 +2029,11 @@ worker_env.virtual = *; /* for now */ worker_env.server_name = (char *)ap_get_server_version(); if (wc_open(init_map, worker_env, conf-log)) { -/* we don't need this any more so free it */ +/* XXX: For each virtual host? */ +if (conf conf-mount_file) { +conf-uw_map-fname = conf-mount_file; +uri_worker_map_load(conf-uw_map, conf-log); +} return; } 1.128 +56 -7 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- mod_jk.c 17 Feb 2005 15:03:15 - 1.127 +++ mod_jk.c 21 Feb 2005 08:29:17 - 1.128 @@ -130,6 +130,7 @@ */ jk_map_t *worker_properties; char *worker_file; +char *mount_file; jk_map_t *uri_to_context; int mountcopy; @@ -844,6 +845,34 @@ } /* + * JkMountFile Directive Handling + * + * JkMountFile file + */ + +static const char *jk_set_mount_file(cmd_parms * cmd, + void *dummy, const char *mount_file) +{ +server_rec *s = cmd-server; +struct stat statbuf; + +jk_server_conf_t *conf = +(jk_server_conf_t *)
cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c
mturk 2005/02/21 01:29:34 Modified:jk/native/iis jk_isapi_plugin.c Log: Update isapi redirector to accept new dynamic uri mappigs. Revision ChangesPath 1.41 +9 -40 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c Index: jk_isapi_plugin.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- jk_isapi_plugin.c 17 Feb 2005 15:03:15 - 1.40 +++ jk_isapi_plugin.c 21 Feb 2005 09:29:34 - 1.41 @@ -134,7 +134,7 @@ static char log_file[MAX_PATH * 2]; static int log_level = JK_LOG_EMERG_LEVEL; static char worker_file[MAX_PATH * 2]; -static char worker_mount_file[MAX_PATH * 2]; +static char worker_mount_file[MAX_PATH * 2] = {0}; #define URI_SELECT_OPT_PARSED 0 #define URI_SELECT_OPT_UNPARSED 1 @@ -1055,47 +1055,16 @@ worker_mount_file); jk_log(logger, JK_LOG_DEBUG, Using uri select %d., uri_select_option); } -if (jk_map_alloc(map)) { -if (jk_map_read_properties(map, worker_mount_file)) { -/* remove non-mapping entries (assume they were string substitutions) */ -jk_map_t *map2; -if (jk_map_alloc(map2)) { -int sz, i; -void *old; - -sz = jk_map_size(map); -for (i = 0; i sz; i++) { -const char *name = jk_map_name_at(map, i); -if (*name == '/' || *name == '!') { -jk_map_put(map2, name, jk_map_value_at(map, i), old); -} -else { -if (JK_IS_DEBUG_LEVEL(logger)) -jk_log(logger, JK_LOG_DEBUG, - Ignoring worker mount file entry %s=%s., - name, jk_map_value_at(map, i)); -} -} - -if (uri_worker_map_alloc(uw_map, map2, logger)) { -rc = JK_TRUE; -} - -jk_map_free(map2); -} -} -else { -jk_log(logger, JK_LOG_EMERG, - Unable to read worker mount file %s., - worker_mount_file); -} -jk_map_free(map); +if (uri_worker_map_alloc(uw_map, NULL, logger)) { +rc = JK_FALSE; +uw_map-fname = worker_mount_file; +if (worker_mount_file[0]) +rc = uri_worker_map_load(uw_map, logger); } - if (rc) { rc = JK_FALSE; if (jk_map_alloc(map)) { -if (jk_map_read_properties(map, worker_file)) { +if (jk_map_read_properties(map, worker_file, NULL)) { /* we add the URI-WORKER MAP since workers using AJP14 will feed it */ worker_env.uri_to_worker = uw_map; @@ -1152,7 +1121,7 @@ jk_map_t *map; if (jk_map_alloc(map)) { -if (jk_map_read_properties(map, ini_file_name)) { +if (jk_map_read_properties(map, ini_file_name, NULL)) { using_ini_file = JK_TRUE; } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/netscape jk_nsapi_plugin.c
mturk 2005/02/21 01:34:25 Modified:jk/native/netscape jk_nsapi_plugin.c Log: Use new load properties api. Revision ChangesPath 1.22 +2 -2 jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c Index: jk_nsapi_plugin.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jk_nsapi_plugin.c 17 Feb 2005 15:03:15 - 1.21 +++ jk_nsapi_plugin.c 21 Feb 2005 09:34:25 - 1.22 @@ -235,7 +235,7 @@ jk_shm_open(shm_file, JK_SHM_DEF_SIZE, logger); if (jk_map_alloc(init_map)) { -if (jk_map_read_properties(init_map, worker_prp_file)) { +if (jk_map_read_properties(init_map, worker_prp_file, NULL)) { int sleep_cnt; SYS_THREAD s; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/netscape jk_nsapi_plugin.c
dear dont send mail this id [EMAIL PROTECTED] wrote: mturk 2005/02/21 01:34:25 Modified: jk/native/netscape jk_nsapi_plugin.c Log: Use new load properties api. Revision Changes Path 1.22 +2 -2 jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c Index: jk_nsapi_plugin.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/netscape/jk_nsapi_plugin.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jk_nsapi_plugin.c 17 Feb 2005 15:03:15 - 1.21 +++ jk_nsapi_plugin.c 21 Feb 2005 09:34:25 - 1.22 @@ -235,7 +235,7 @@ jk_shm_open(shm_file, JK_SHM_DEF_SIZE, logger); if (jk_map_alloc(init_map)) { - if (jk_map_read_properties(init_map, worker_prp_file)) { + if (jk_map_read_properties(init_map, worker_prp_file, NULL)) { int sleep_cnt; SYS_THREAD s; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - Do you Yahoo!? Yahoo! Search presents - Jib Jab's 'Second Term'
[GUMP@brutus]: Project jakarta-tomcat-jk-native (in module jakarta-tomcat-connectors) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-jk-native has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 29 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-jk-native : Connectors to various web servers Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/gump_work/build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native.html Work Name: build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native (Type: Build) Work ended in a state of : Failed Elapsed: Command Line: make [Working Directory: /usr/local/gump/public/workspace/jakarta-tomcat-connectors/jk/native] - Making all in common make[1]: Entering directory `/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common' /bin/sh /usr/local/gump/public/workspace/apache-httpd/dest-21022005/build/libtool --silent --mode=compile gcc -I/usr/local/gump/public/workspace/apache-httpd/dest-21022005/include -g -O2 -g -O2 -pthread -DHAVE_APR -I/usr/local/gump/public/workspace/apr/dest-21022005/include/apr-1 -g -O2 -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I/home/gump/workspaces2/public/workspace/apache-httpd/srclib/pcre -I /opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp12_worker.c /usr/local/gump/public/workspace/apache-httpd/dest-21022005/build/libtool: /usr/local/gump/public/workspace/apache-httpd/dest-21022005/build/libtool: No such file or directory make[1]: *** [jk_ajp12_worker.lo] Error 127 make[1]: Leaving directory `/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common' make: *** [all-recursive] Error 1 - To subscribe to this information via syndicated feeds: - RSS: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/rss.xml - Atom: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/atom.xml == Gump Tracking Only === Produced by Gump version 2.2. Gump Run 4621022005, brutus:brutus-public:4621022005 Gump E-mail Identifier (unique within run) #15. -- Apache Gump http://gump.apache.org/ [Instance: brutus] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_shm.h
mturk 2005/02/21 02:31:08 Modified:jk/native/common jk_shm.h Log: Use volatile to supress (hopefully) caching in registers the data that can be changed in multi cpu systems. Revision ChangesPath 1.16 +13 -13jakarta-tomcat-connectors/jk/native/common/jk_shm.h Index: jk_shm.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_shm.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jk_shm.h 20 Feb 2005 18:31:21 - 1.15 +++ jk_shm.h 21 Feb 2005 10:31:08 - 1.16 @@ -55,7 +55,7 @@ { int id; /* Number of currently busy channels */ -int busy; +volatile int busy; /* worker name */ charname[JK_SHM_STR_SIZ+1]; /* worker domain */ @@ -63,28 +63,28 @@ /* worker redirect route */ charredirect[JK_SHM_STR_SIZ+1]; /* current status of the worker */ -int is_disabled; -int is_busy; +volatile int is_disabled; +volatile int is_busy; /* Current lb factor */ -int lb_factor; +volatile int lb_factor; /* Current lb value */ -int lb_value; -int in_error_state; -int in_recovering; +volatile int lb_value; +volatile int in_error_state; +volatile int in_recovering; int sticky_session; int sticky_session_force; int recover_wait_time; int retries; /* Statistical data */ -time_t error_time; +volatile time_t error_time; /* Number of bytes read from remote */ -size_t readed; +volatile size_t readed; /* Number of bytes transferred to remote */ -size_t transferred; +volatile size_t transferred; /* Number of times the worker was elected */ -size_t elected; +volatile size_t elected; /* Number of non 200 responses */ -size_t errors; +volatile size_t errors; }; typedef struct jk_shm_worker jk_shm_worker_t; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c jk_uri_worker_map.c
mturk 2005/02/21 03:18:48 Modified:jk/native/common jk_connect.c jk_uri_worker_map.c Log: Remove unused code. Revision ChangesPath 1.45 +4 -36 jakarta-tomcat-connectors/jk/native/common/jk_connect.c Index: jk_connect.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- jk_connect.c 20 Feb 2005 08:15:33 - 1.44 +++ jk_connect.c 21 Feb 2005 11:18:48 - 1.45 @@ -382,6 +382,7 @@ return buf; } +#if 0 static int soblock(int sd) { /* BeOS uses setsockopt at present for non blocking... */ @@ -439,7 +440,8 @@ return 0; } -#if 1 +#endif + int jk_is_socket_connected(int sd, int timeout) { fd_set fd; @@ -462,37 +464,3 @@ return 0; } } - -#else - -#if defined(WIN32) || (defined(NETWARE) defined(__NOVELL_LIBC__)) -#define EWOULDBLOCK (WSAEWOULDBLOCK - WSABASEERR) -#endif - -int jk_is_socket_connected(int sd, int timeout) -{ -unsigned char test_buffer[1]; -int rc; -/* Set socket to nonblocking */ -if ((rc = sononblock(sd)) != 0) -return (errno 0) ? -errno : errno; - -rc = jk_tcp_socket_recvfull(sd, test_buffer, 1) * (-1); -soblock(sd); -#ifdef WIN32 -/* Reset socket timeouts if the new timeout differs from the old timeout */ -if (timeout 0) { -/* Timeouts are in msec, represented as int */ -setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, -(char *) timeout, sizeof(int)); -setsockopt(sd, SOL_SOCKET, SO_SNDTIMEO, -(char *) timeout, sizeof(int)); -} -#endif -if (rc == EWOULDBLOCK || rc == -1) -return 1; -else -return rc; -} - -#endif 1.50 +4 -5 jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c Index: jk_uri_worker_map.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- jk_uri_worker_map.c 21 Feb 2005 08:27:13 - 1.49 +++ jk_uri_worker_map.c 21 Feb 2005 11:18:48 - 1.50 @@ -136,7 +136,7 @@ { JK_TRACE_ENTER(l); -if (init_data uw_map) { +if (uw_map) { int rc; *uw_map = (jk_uri_worker_map_t *)calloc(1, sizeof(jk_uri_worker_map_t)); @@ -148,8 +148,8 @@ JK_TRACE_EXIT(l); return JK_FALSE; } - -rc = uri_worker_map_open(*uw_map, init_data, l); +if (init_data) +rc = uri_worker_map_open(*uw_map, init_data, l); JK_TRACE_EXIT(l); return rc; } @@ -234,7 +234,6 @@ char *uri; unsigned int match_type = 0; unsigned int i; -int allocated = 0; JK_TRACE_ENTER(l); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Changing the Tomcat5 WIN32 service runner
Hi, For anyone interested there is a new project for jakarata-commons/daemon procrun named *srvbatch*, siting there for couple of months. Unlike any other java or java/jni implementations it does not tries to make a java as a service, but rather makes a batch (.bat) file as a service. This way the same configuration (catalina.bat) can be used both for running from command line or for running from service. It usually needs a separate batch file that is closely related to any unix service file (see exservice.bat). What do you think that we change the current windows distribution to follow this new concept? IMO it's more simpler and stable then current way the procrun is used. Regards, Mladen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Changing the Tomcat5 WIN32 service runner
Mladen Turk wrote: Hi, For anyone interested there is a new project for jakarata-commons/daemon procrun named *srvbatch*, siting there for couple of months. Unlike any other java or java/jni implementations it does not tries to make a java as a service, but rather makes a batch (.bat) file as a service. This way the same configuration (catalina.bat) can be used both for running from command line or for running from service. It usually needs a separate batch file that is closely related to any unix service file (see exservice.bat). What do you think that we change the current windows distribution to follow this new concept? IMO it's more simpler and stable then current way the procrun is used. I'm not in favor of that :( I hate .bat files, so ... Rmy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33671] New: - Manual Windows service installation with custom name using service.bat fails.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33671. 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=33671 Summary: Manual Windows service installation with custom name using service.bat fails. Product: Tomcat 5 Version: 5.0.28 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] Trying to install Tomcat 5.0.28 as a windows service using provided service.bat script fails if the optional custom name contains '.', or '_'. Example. Running: service.bat install successfully install a service named 'tomcat5' with description 'Apache Tomcat' Running: service.bat install tc_5 fails with a GUI alert reporting: Overlapped I/O operation is in progress NonAlpha 95 Closing the alert causes the console to show: Installing the service 'tc_5' ... Using CATALINA_HOME:D:\Programmi\jakarta-tomcat-5.0.28 Using JAVA_HOME:D:\programmi\j2sdk1.4.2_07 [2005-02-21 15:37:38] [349 prunsrv.c] [error] The system cannot find the file specified. [2005-02-21 15:37:38] [1037 prunsrv.c] [error] Load configuration failed [2005-02-21 15:37:38] [349 prunsrv.c] [error] The system cannot find the file specified. [2005-02-21 15:37:38] [1037 prunsrv.c] [error] Load configuration failed The service 'tc_5' has been installed. Running: service.bat install tc5 (custom name without underscore) runs nicely. -- 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]
JAAS changes in 5.5.8-alpha
Hi, I've just upgraded Geronimo to use Tomcat 5.5.8-alpha and suddenly one of the JAAS test that worked well in 5.5.7 failed. I haven't yet investigated what could break it, thus nothing can I say about the issue. What changed between 5.5.7 and 5.5.8-alpha that could cause a JAAS test in Geronimo/Tomcat to fail ? It works well in 5.5.7, but fails in 5.5.8-alpha. Jacek - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c
mturk 2005/02/21 08:14:13 Modified:jk/native/common jk_lb_worker.c Log: Fix missing service jvm_route settings. Revision ChangesPath 1.64 +5 -3 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c Index: jk_lb_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- jk_lb_worker.c19 Feb 2005 08:12:29 - 1.63 +++ jk_lb_worker.c21 Feb 2005 16:14:13 - 1.64 @@ -203,6 +203,7 @@ for (i = 0; i p-num_of_workers; i++) { if (strcmp(p-lb_workers[i].s-name, name) == 0) { rc = p-lb_workers[i]; +rc-r = (rc-s-name[0]); break; } } @@ -324,8 +325,9 @@ curmin = mytraffic; } } -} - +} +if (candidate) +candidate-r = (candidate-s-name[0]); return candidate; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c
mturk 2005/02/21 08:40:45 Modified:jk/native/common jk_status.c Log: So not display uri mappings for balancer members. They are the same as for balancer anyhow. Revision ChangesPath 1.23 +1 -4 jakarta-tomcat-connectors/jk/native/common/jk_status.c Index: jk_status.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jk_status.c 21 Feb 2005 08:24:08 - 1.22 +++ jk_status.c 21 Feb 2005 16:40:45 - 1.23 @@ -471,9 +471,6 @@ jk_puts(s, checked); jk_puts(s, /td/tr\n); jk_puts(s, /td/tr\n/table\n); - -display_maps(s, sw, s-uw_map, wr-s-name, l); - jk_puts(s, br /input type=submit value=\Update Worker\\n/form\n); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c
mturk 2005/02/21 09:02:50 Modified:jk/native/common jk_lb_worker.c Log: Update lb_values for session workers. Revision ChangesPath 1.65 +17 -1 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c Index: jk_lb_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- jk_lb_worker.c21 Feb 2005 16:14:13 - 1.64 +++ jk_lb_worker.c21 Feb 2005 17:02:50 - 1.65 @@ -204,6 +204,22 @@ if (strcmp(p-lb_workers[i].s-name, name) == 0) { rc = p-lb_workers[i]; rc-r = (rc-s-name[0]); +if (!JK_WORKER_IN_ERROR(rc-s) +p-lbmethod == JK_LB_BYREQUESTS) { +unsigned int j; +int total_factor = 0; +for (j = 0; j p-num_of_workers; j++) { +if (JK_WORKER_USABLE(p-lb_workers[i].s) +strlen(rc-s-domain) +(strlen(p-lb_workers[i].s-domain) == 0 || + strcmp(p-lb_workers[i].s-domain, rc-s-domain))) +continue; +p-lb_workers[i].s-lb_value += p-lb_workers[i].s-lb_factor; +total_factor += p-lb_workers[i].s-lb_factor; +} +rc-s-lb_value -= total_factor; +} + break; } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c
mturk 2005/02/21 09:10:00 Modified:jk/native/common jk_lb_worker.c Log: Revert the latest patch. The factor is already calculated. What was missnig was the lbmethod check. Revision ChangesPath 1.66 +3 -18 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c Index: jk_lb_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- jk_lb_worker.c21 Feb 2005 17:02:50 - 1.65 +++ jk_lb_worker.c21 Feb 2005 17:10:00 - 1.66 @@ -204,22 +204,6 @@ if (strcmp(p-lb_workers[i].s-name, name) == 0) { rc = p-lb_workers[i]; rc-r = (rc-s-name[0]); -if (!JK_WORKER_IN_ERROR(rc-s) -p-lbmethod == JK_LB_BYREQUESTS) { -unsigned int j; -int total_factor = 0; -for (j = 0; j p-num_of_workers; j++) { -if (JK_WORKER_USABLE(p-lb_workers[i].s) -strlen(rc-s-domain) -(strlen(p-lb_workers[i].s-domain) == 0 || - strcmp(p-lb_workers[i].s-domain, rc-s-domain))) -continue; -p-lb_workers[i].s-lb_value += p-lb_workers[i].s-lb_factor; -total_factor += p-lb_workers[i].s-lb_factor; -} -rc-s-lb_value -= total_factor; -} - break; } } @@ -398,7 +382,8 @@ candidate = NULL; } } -if (candidate !uses_domain) { +if (candidate !uses_domain +p-lbmethod == JK_LB_BYREQUESTS) { for (i = 0; i p-num_of_workers; i++) { if (JK_WORKER_USABLE(p-lb_workers[i].s)) { /* Skip all workers that are not member of candidate domain */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: JAAS changes in 5.5.8-alpha
Jacek Laskowski wrote: Hi, I've just upgraded Geronimo to use Tomcat 5.5.8-alpha and suddenly one of the JAAS test that worked well in 5.5.7 failed. I haven't yet investigated what could break it, thus nothing can I say about the issue. What changed between 5.5.7 and 5.5.8-alpha that could cause a JAAS test in Geronimo/Tomcat to fail ? It works well in 5.5.7, but fails in 5.5.8-alpha. I see no changes in the JAAS code, besides removing some logging. You can check the CVS history. Rmy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
mturk 2005/02/21 10:00:41 Modified:jk/native/apache-1.3 mod_jk.c jk/native/apache-2.0 mod_jk.c Log: Add apache log warning if shared memory is not defined for unix platforms. Although it will work, the dynamic config will be unavailable, so inform the user about that fact. Revision ChangesPath 1.72 +7 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- mod_jk.c 21 Feb 2005 08:29:17 - 1.71 +++ mod_jk.c 21 Feb 2005 18:00:41 - 1.72 @@ -1985,6 +1985,12 @@ else jk_log(conf-log, JK_LOG_ERROR, Initializing shm:%s errno=%d, jk_shm_name(), rc); +#if !defined (WIN32) || !defined(NETWARE) +if (!jk_shm_file) +ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, NULL, + No JkShmFile defined in httpd.conf. + LoadBalancer will not function properly!); +#endif /* SREVILAK -- register cleanup handler to clear resources on restart, * to make sure log file gets closed in the parent process */ 1.129 +9 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- mod_jk.c 21 Feb 2005 08:29:17 - 1.128 +++ mod_jk.c 21 Feb 2005 18:00:41 - 1.129 @@ -2348,6 +2348,13 @@ else jk_log(conf-log, JK_LOG_ERROR, Initializing shm:%s errno=%d, jk_shm_name(), rc); +#if !defined (WIN32) || !defined(NETWARE) +if (!jk_shm_file) +ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, + 0, NULL, + No JkShmFile defined in httpd.conf. + LoadBalancer will not function properly!); +#endif /* Set default connection cache size for worker mpm */ #if APR_HAS_THREADS @@ -2392,7 +2399,7 @@ apr_status_t rv; jk_server_conf_t *conf; server_rec *srv = s; - + /* create the jk log lockfiles in the parent */ if ((rv = apr_global_mutex_create(jk_log_lock, NULL, APR_LOCK_DEFAULT, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33680] New: - Having a user defined SecurityManager class renders JasperException with reason cannot be resolved in JSPs.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33680. 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=33680 Summary: Having a user defined SecurityManager class renders JasperException with reason cannot be resolved in JSPs. Product: Tomcat 5 Version: 5.5.7 Platform: PC OS/Version: Windows Server 2003 Status: NEW Severity: minor Priority: P4 Component: Jasper AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] I have a webapp where I've created a SecurityManager class of my own, which has nothing to do with the Catalina SecurityManager. Trying to use this class results in a JasperException SecurityManager cannot be resolved. Using the exact same code, but with a different class name does not produce an error. Steps to Reproduce: Create class called SecurityManager.java as something e.g. package test; public class SecurityManager { public static int getInt() { return 1; } } Create an identical copy as SecurityManagerX.java Compile and call from a simple jsp: %@ page import=test.* % htmlheadtitleTestpage/title/head body %=SecurityManager.getInt()% /body /html Notice how error does not appear if the SecurityManagerX class is called instead. Important: Also notice that after the error has appeared, it is possible to successfully call the SecurityManager.getInt() method for about 4-5 seconds (by reloading the page) before the error appears again (!). Actual Results: org.apache.jasper.JasperException: Unable to compile class for JSP An error occurred at line: 4 in the jsp file: /test.jsp Generated servlet error: SecurityManager cannot be resolved org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:84) org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:328) org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:397) org.apache.jasper.compiler.Compiler.compile(Compiler.java:288) org.apache.jasper.compiler.Compiler.compile(Compiler.java:267) org.apache.jasper.compiler.Compiler.compile(Compiler.java:255) org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:556) org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:296) org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:295) org.apache.jasper.servlet.JspServlet.service(JspServlet.java:245) javax.servlet.http.HttpServlet.service(HttpServlet.java:802) Build Date Platform: Tomcat 5.5.7 on Win2K3. Default Catalins security policy. Perhaps this isn't a bug, but some security measure wrt the Catalina SecurityManager class. In that case it is strange that you may execute a user created SecurityManager class for a short period of times between subsequent errors. -- 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]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config resources.xml
markt 2005/02/21 14:53:44 Modified:webapps/tomcat-docs/config resources.xml Log: As a result of patch for 21818 these attributes are now set on the context. Revision ChangesPath 1.5 +2 -24 jakarta-tomcat-4.0/webapps/tomcat-docs/config/resources.xml Index: resources.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/resources.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- resources.xml 19 Nov 2004 20:52:02 - 1.4 +++ resources.xml 21 Feb 2005 22:53:44 - 1.5 @@ -70,30 +70,8 @@ subsection name=Standard Implementation pThe standard implementation of strongResources/strong is -strongorg.apache.naming.resources.FileDirContext/strong. -It supports the following additional attributes (in addition to the -common attributes listed above):/p - -attributes - - attribute name=cached required=false -pThis boolean flag indicates if the resources should be cached. It -defaults to codetrue/code. This flag only has an effect if the -emcachingAllowed/em attribute of the containing -a href=context.html Context/a is set to codetrue/code./p - /attribute - - attribute name=caseSensitive required=false -pThis is the functional equivalent to the emcaseSensitive/em -of a a href=context.htmlContext/a./p - /attribute - - attribute name=docBase required=false -pThis is the functional equivalent to the emDocument Base/em -of a a href=context.htmlContext/a./p - /attribute - -/attributes +strongorg.apache.naming.resources.FileDirContext/strong, and +is configured by its parent Context element./p /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config context.xml http11.xml
markt 2005/02/21 14:54:23 Modified:webapps/tomcat-docs/config context.xml http11.xml Log: Add warning to docs regarding use of deprecated connector and allowLinking=true Revision ChangesPath 1.15 +5 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/context.xml Index: context.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/context.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- context.xml 19 Nov 2004 20:52:02 - 1.14 +++ context.xml 21 Feb 2005 22:54:23 - 1.15 @@ -178,6 +178,11 @@ (or any other OS which does not have a case sensitive filesystem), as it will disable case sensitivity checks, allowing JSP source code disclosure, among other security problems./b/p +pbNOTE: This flag MUST NOT be set to true when using the deprecated +a href=http11.htmlHTTP 1.1/a connector as it will disable checks +that protect against mal-formed requests resulting in JSP source code +disclosure./b/p + /attribute attribute name=cacheTTL required=false 1.7 +6 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/http11.xml Index: http11.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/http11.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- http11.xml12 Jan 2003 17:26:48 - 1.6 +++ http11.xml21 Feb 2005 22:54:23 - 1.7 @@ -19,6 +19,12 @@ pbIMPORTANT NOTE: The HTTP/1.1 connector is now deprecated. Use the Coyote HTTP/1.1 connector instead./b/p + pbIMPORTANT NOTE: This connector MUST NOT be used in conjunction + with any a href=context.htmlContext/a element that has the + codeallowLinking/code attribute set to codetrue/code. In this + configuration it is possible for a mal-formed request to result in source + code exposure of JSPs./b/p + pThe strongHTTP/1.1 Connector/strong element represents a strongConnector/strong component that supports the HTTP/1.1 protocol. It enables Catalina to function as a stand-alone web server, in addition - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: mod_jk release policy - was: JK 1.2.9-dev test results
At 04:43 AM 2/19/2005, Remy Maucherat wrote: William A. Rowe, Jr. wrote: It definately seems like j-t-c should be a first candidate for svn conversion. The other jakarta-tomcat repositories are considerabily more complex. But it would be good to have line endings straightened out beforehand. I find svn quite confusing to work with. Especially, the possibility of browsing a revision tree seems unusable (due to the fact that revisions are global, tortoise cannot make a graph in less than 4 hours :( ), and it's an important tool for me. Unfortunately, this means I'll have to veto a move to svn for the time being, until I figure out how to use it. Sadly, I agree with you - my biggest hiccup is the mess that moving from cvs-svn creates if you want to see annotated source files - knowing a line changed in 1.99.3.1 is hugely important to me. Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Changing the Tomcat5 WIN32 service runner
At 06:31 AM 2/21/2005, Mladen Turk wrote: Unlike any other java or java/jni implementations it does not tries to make a java as a service, but rather makes a batch (.bat) file as a service. IIUC, that means; 1. service signals (shutdown etc) aren't recognized by cmd (sh for you linux observers) in any useful manner. 2. it invokes cmd, which invokes the apps. You are stuck with an instance of cmd for the lifetime of the process. Seems like a big leap backwards, IMHO. If anything, a psuedo-sh script interpreter which picked up the envvar assignments (the only thing you want to move to .cmd for, anyways) makes more sense than this. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[SECURITY ISSUE] Using allowLinking with deprecated HTTP 1.1 connector
All, A security issue has come to light where a mal-formed request may result in JSP source code disclosure. This issue only applies if all of the following are true: 1. You are using any Tomcat 4 version = 4.1.15 2. You are using the deprecated HTTP 1.1 connector (org.apache.catalina.connector.http.HttpConnector) 3. You have configured 1 or more contexts served by the connector with a resources element that uses the allowLinking parameter and this parameter is set to true. The fix is to use the Coyote HTTP connector (org.apache.coyote.tomcat4.CoyoteConnector). The on-line Tomcat 4 docs have been updated to include a warning about this configuration combination. The next Tomcat 4 release will include the updated documentation. If you are using Tomcat 4 with the standard Coyote HTTP connector this issue does not apply. Tomcat 5.0.x and 5.5.x are unaffected by this issue. Thanks are due to Glenn Choat who reported this issue to the Tomcat team last week. As a reminder, if you have a verified security bug to report please do not post it to email lists or submit a bug report. Security bugs should be reported privately by email to [EMAIL PROTECTED] Regards, Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[site] New Jakarta download pages
(Bcc'd to all Jakarta dev lists) Partly an announcement that the Jakarta download pages have been changed somewhat. Rather than one huge page, it's a whole set of pages. So when time comes to do your next release, you modify site/downloads/downloads.xml and run ant. Source, binary and nightly-builds are all part of the same page. More importantly, a suggestion that projects should no longer link to the top download page, but instead link to their particular download page. So POI would link to: http://jakarta.apache.org/site/downloads/downloads_poi.cgi Commons would link to: http://jakarta.apache.org/site/downloads/downloads_commons.html Commons IO would link to: http://jakarta.apache.org/site/downloads/downloads_commons-io.cgi and so on. The new pages should be exact matches to the previous binindex and sourceindex pages. One requested improvement is for filenames to be specified rather than '1.0.zip'. Hopefully we can make that change globally by figuring out the xslt to get the filename from a url. Another improvement is to add the cvs.apache.org/snapshot/velocity, and any other live snapshots as Nightly Builds. Apologies for the cross-list posting, wanted to make sure everybody got the memo about changing the download links if they want. :) Please direct replies back to the general list. Hen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c
mturk 2005/02/21 23:26:55 Modified:jk/native/common jk_lb_worker.c Log: Fix infinite loop when all workers are in error state and sticky_session_force is defined. If we found a worker by session id, and its in error state, return no worker if sticky_session_force is defined (forbiden failover) Revision ChangesPath 1.67 +4 -2 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c Index: jk_lb_worker.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- jk_lb_worker.c21 Feb 2005 17:10:00 - 1.66 +++ jk_lb_worker.c22 Feb 2005 07:26:55 - 1.67 @@ -372,7 +372,9 @@ * balancer. Of course you will need a some kind of * session replication between those two remote. */ -if (*candidate-s-redirect) +if (p-s-sticky_session_force) +candidate = NULL; +else if (*candidate-s-redirect) candidate = find_by_session(p, candidate-s-redirect, l); else if (*candidate-s-domain !uses_domain) { uses_domain = 1; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]