svn commit: r481745 - in /tomcat/connectors/trunk/procrun/bin: tomcat5.exe tomcat5.exe.amd64 tomcat5w.exe tomcat5w.exe.amd64

[mturk]

Author: mturk
Date: Sun Dec  3 01:49:18 2006
New Revision: 481745

URL: http://svn.apache.org/viewvc?view=rev&rev=481745
Log:
Update binaries with --ServiceUser/ServicePassword option.

Modified:
tomcat/connectors/trunk/procrun/bin/tomcat5.exe
tomcat/connectors/trunk/procrun/bin/tomcat5.exe.amd64
tomcat/connectors/trunk/procrun/bin/tomcat5w.exe
tomcat/connectors/trunk/procrun/bin/tomcat5w.exe.amd64

Modified: tomcat/connectors/trunk/procrun/bin/tomcat5.exe
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/procrun/bin/tomcat5.exe?view=diff&rev=481745&r1=481744&r2=481745
==
Binary files - no diff available.

Modified: tomcat/connectors/trunk/procrun/bin/tomcat5.exe.amd64
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/procrun/bin/tomcat5.exe.amd64?view=diff&rev=481745&r1=481744&r2=481745
==
Binary files - no diff available.

Modified: tomcat/connectors/trunk/procrun/bin/tomcat5w.exe
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/procrun/bin/tomcat5w.exe?view=diff&rev=481745&r1=481744&r2=481745
==
Binary files - no diff available.

Modified: tomcat/connectors/trunk/procrun/bin/tomcat5w.exe.amd64
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/procrun/bin/tomcat5w.exe.amd64?view=diff&rev=481745&r1=481744&r2=481745
==
Binary files - no diff available.



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

svn commit: r481746 - in /tomcat/tc6.0.x/trunk/res/procrun: tomcat6.exe tomcat6w.exe

[mturk]

Author: mturk
Date: Sun Dec  3 01:49:40 2006
New Revision: 481746

URL: http://svn.apache.org/viewvc?view=rev&rev=481746
Log:
Update binaries with --ServiceUser/ServicePassword option.

Modified:
tomcat/tc6.0.x/trunk/res/procrun/tomcat6.exe
tomcat/tc6.0.x/trunk/res/procrun/tomcat6w.exe

Modified: tomcat/tc6.0.x/trunk/res/procrun/tomcat6.exe
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/procrun/tomcat6.exe?view=diff&rev=481746&r1=481745&r2=481746
==
Binary files - no diff available.

Modified: tomcat/tc6.0.x/trunk/res/procrun/tomcat6w.exe
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/procrun/tomcat6w.exe?view=diff&rev=481746&r1=481745&r2=481746
==
Binary files - no diff available.



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

DO NOT REPLY [Bug 41096] - security problem with javamail

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





--- Additional Comments From [EMAIL PROTECTED]  2006-12-03 02:38 ---
Thanks for your replies. I have added the suggested config-lines WITHOUT
successful results.

The second line you suggest isn't useful in my case because I have a 
"can't access to class" error, and not a "javamail can't connect".

I'm at your disposition for every test.

Thanks for your time.
Roberto Colmegna

-- 
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 40668] - MailSessionFactory is missing in Tomcat 5.5.20

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





--- Additional Comments From [EMAIL PROTECTED]  2006-12-03 03:02 ---
(In reply to comment #13)
> This is really pathetic ...

While breaking any application that uses a container-provided JNDI mail session
because of a silly build mistake is indeed unfortunate, I think "pathetic" is
perhaps too strong a word.

It would, however, be very nice to be able to use the binary release instead of
having to roll my own. When I tell other people in my company that the official
 Tomcat binary doesn't work any more due to this issue, the first response I get
is "what container should we switch to?" rather than "let's just compile our own
version."


-- 
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: r481759 - /tomcat/connectors/trunk/jk/tools/jkrelease.sh

[rjung]

Author: rjung
Date: Sun Dec  3 03:59:36 2006
New Revision: 481759

URL: http://svn.apache.org/viewvc?view=rev&rev=481759
Log:
Update JK release skript according to new documentation structure.

Modified:
tomcat/connectors/trunk/jk/tools/jkrelease.sh

Modified: tomcat/connectors/trunk/jk/tools/jkrelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/tools/jkrelease.sh?view=diff&rev=481759&r1=481758&r2=481759
==
--- tomcat/connectors/trunk/jk/tools/jkrelease.sh (original)
+++ tomcat/connectors/trunk/jk/tools/jkrelease.sh Sun Dec  3 03:59:36 2006
@@ -160,7 +160,7 @@
 ;;
 esac
 rm -f CHANGES
-${TOOL} ../docs/printer/changelog.html > CHANGES 2>/dev/null
+${TOOL} ../docs/miscellaneous/printer/changelog.html > CHANGES 2>/dev/null
 if [ -f CHANGES -a -s CHANGES ]
 then
   failed=false
@@ -175,7 +175,6 @@
 fi
 
 # Export text docs
-${TOOL} ../docs/printer/changelog.html >CHANGES
 ${TOOL} ../docs/news/printer/20060101.html >NEWS
 ${TOOL} ../docs/news/printer/20050101.html >>NEWS
 ${TOOL} ../docs/news/printer/20041100.html >>NEWS



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

svn commit: r481766 - in /tomcat/tc6.0.x/trunk/native/connector: configure.in include/tcn_version.h os/win32/libtcnative.rc os/win32/system.c src/error.c src/network.c src/ssl.c src/sslcontext.c src/s

[mturk]

Author: mturk
Date: Sun Dec  3 04:40:18 2006
New Revision: 481766

URL: http://svn.apache.org/viewvc?view=rev&rev=481766
Log:
Backport nonssl patches from tomcat-connectors/trunk

Modified:
tomcat/tc6.0.x/trunk/native/connector/configure.in
tomcat/tc6.0.x/trunk/native/connector/include/tcn_version.h
tomcat/tc6.0.x/trunk/native/connector/os/win32/libtcnative.rc
tomcat/tc6.0.x/trunk/native/connector/os/win32/system.c
tomcat/tc6.0.x/trunk/native/connector/src/error.c
tomcat/tc6.0.x/trunk/native/connector/src/network.c
tomcat/tc6.0.x/trunk/native/connector/src/ssl.c
tomcat/tc6.0.x/trunk/native/connector/src/sslcontext.c
tomcat/tc6.0.x/trunk/native/connector/src/sslinfo.c
tomcat/tc6.0.x/trunk/native/connector/src/sslnetwork.c
tomcat/tc6.0.x/trunk/native/connector/src/sslutils.c

Modified: tomcat/tc6.0.x/trunk/native/connector/configure.in
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/native/connector/configure.in?view=diff&rev=481766&r1=481765&r2=481766
==
--- tomcat/tc6.0.x/trunk/native/connector/configure.in (original)
+++ tomcat/tc6.0.x/trunk/native/connector/configure.in Sun Dec  3 04:40:18 2006
@@ -101,8 +101,7 @@
 APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/$JAVA_INC])
 
 dnl sableVM does not have/need $JAVA_OS/jni_md.h
-if test "$SABLEVM" = "NONE"
-then
+if test "$SABLEVM" = "NONE"; then
   TCN_FIND_JDK_OS
   if test -z "${JAVA_OS}"; then
 AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC])
@@ -119,7 +118,19 @@
 dnl
 dnl Detect openssl toolkit installation
 dnl
-TCN_CHECK_SSL_TOOLKIT
+
+use_openssl=true;
+
+AC_ARG_ENABLE(openssl, 
+[ --disable-openssl   avoid using OpenSSL toolkit],
+[
+  use_openssl=false;
+  AC_MSG_RESULT([Disabling SSL support...])
+])
+
+if $use_openssl ; then
+  TCN_CHECK_SSL_TOOLKIT
+fi
 
 so_ext=$APR_SO_EXT
 lib_target=$APR_LIB_TARGET

Modified: tomcat/tc6.0.x/trunk/native/connector/include/tcn_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/native/connector/include/tcn_version.h?view=diff&rev=481766&r1=481765&r2=481766
==
--- tomcat/tc6.0.x/trunk/native/connector/include/tcn_version.h (original)
+++ tomcat/tc6.0.x/trunk/native/connector/include/tcn_version.h Sun Dec  3 
04:40:18 2006
@@ -69,7 +69,7 @@
 #define TCN_MINOR_VERSION   1
 
 /** patch level */
-#define TCN_PATCH_VERSION   6
+#define TCN_PATCH_VERSION   8
 
 /**
  *  This symbol is defined for internal, "development" copies of TCN. This

Modified: tomcat/tc6.0.x/trunk/native/connector/os/win32/libtcnative.rc
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/native/connector/os/win32/libtcnative.rc?view=diff&rev=481766&r1=481765&r2=481766
==
--- tomcat/tc6.0.x/trunk/native/connector/os/win32/libtcnative.rc (original)
+++ tomcat/tc6.0.x/trunk/native/connector/os/win32/libtcnative.rc Sun Dec  3 
04:40:18 2006
@@ -19,7 +19,7 @@
 "specific language governing permissions and " \
 "limitations under the License."
 
-#define TCN_VERISON "1.1.6"
+#define TCN_VERISON "1.1.8"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -35,8 +35,8 @@
 END
 
 1 VERSIONINFO
- FILEVERSION 1,1,6,0
- PRODUCTVERSION 1,1,6,0
+ FILEVERSION 1,1,8,0
+ PRODUCTVERSION 1,1,8,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

Modified: tomcat/tc6.0.x/trunk/native/connector/os/win32/system.c
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/native/connector/os/win32/system.c?view=diff&rev=481766&r1=481765&r2=481766
==
--- tomcat/tc6.0.x/trunk/native/connector/os/win32/system.c (original)
+++ tomcat/tc6.0.x/trunk/native/connector/os/win32/system.c Sun Dec  3 04:40:18 
2006
@@ -34,7 +34,9 @@
 #include "apr_arch_atime.h"  /* for FileTimeToAprTime */
 
 #include "tcn.h"
+#ifdef HAVE_OPENSSL
 #include "ssl_private.h"
+#endif
 
 #pragma warning(push)
 #pragma warning(disable : 4201)
@@ -371,6 +373,8 @@
 return rv;
 }
 
+#ifdef HAVE_OPENSSL
+
 static DWORD WINAPI password_thread(void *data)
 {
 tcn_pass_cb_t *cb = (tcn_pass_cb_t *)data;
@@ -461,4 +465,4 @@
 return (int)strlen(data->password);
 }
 
-
+#endif

Modified: tomcat/tc6.0.x/trunk/native/connector/src/error.c
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/native/connector/src/error.c?view=diff&rev=481766&r1=481765&r2=481766
==
--- tomcat/tc6.0.x/trunk/native/connector/src/error.c (original)
+++ tomcat/tc6.0.x/trunk/native/connector/src/error.c Sun Dec  3 04:40:18 2006
@@ -70,7 +70,7 @@
 if (f != file) {
 f++;
 }
-sprintf(fmt, "%s for [%s::%04d]", msg, line, f);
+sprintf(fmt, "%s for [EMAIL PROTECTED]", msg, line

svn commit: r481770 - in /tomcat/connectors/trunk/jk: native/apache-1.3/ native/apache-2.0/ native/common/ native/iis/ native/netscape/ xdocs/ajp/ xdocs/config/ xdocs/miscellaneous/

[rjung]

Author: rjung
Date: Sun Dec  3 04:55:56 2006
New Revision: 481770

URL: http://svn.apache.org/viewvc?view=rev&rev=481770
Log:
Rename jvm_route to route:
- You can still use the old name in the worker configuration.
  In case of conflicts, the new name will win.
- Added jvm_route to the deprecated list in the code and
  in the docs.
- All log messages and the status worker will now only
  refer to "route".
- All internal implementation names have been changed as well.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.h
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
tomcat/connectors/trunk/jk/native/common/jk_service.h
tomcat/connectors/trunk/jk/native/common/jk_shm.h
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/native/common/jk_util.h
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/ajp/ajpv13a.xml
tomcat/connectors/trunk/jk/xdocs/ajp/ajpv13ext.xml
tomcat/connectors/trunk/jk/xdocs/config/workers.xml
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=481770&r1=481769&r2=481770
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Dec  3 04:55:56 
2006
@@ -496,7 +496,7 @@
 {
 request_rec *r = private_data->r;
 char *ssl_temp = NULL;
-s->jvm_route = NULL;/* Used for sticky session routing */
+s->route = NULL;/* Used for sticky session routing */
 
 /* Copy in function pointers (which are really methods) */
 s->start_response = ws_start_response;
@@ -2008,8 +2008,8 @@
 ap_psprintf(r->pool, "%.1ld.%.6ld", seconds, micro);
 ap_table_setn(r->notes, JK_NOTE_REQUEST_DURATION, 
duration);
 #endif
-if (s.jvm_route && *s.jvm_route)
-ap_table_setn(r->notes, JK_NOTE_WORKER_ROUTE, 
s.jvm_route);
+if (s.route && *s.route)
+ap_table_setn(r->notes, JK_NOTE_WORKER_ROUTE, s.route);
 request_log_transaction(r, conf);
 }
 }

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?view=diff&rev=481770&r1=481769&r2=481770
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Dec  3 04:55:56 
2006
@@ -516,7 +516,7 @@
 request_rec *r = private_data->r;
 
 char *ssl_temp = NULL;
-s->jvm_route = NULL;/* Used for sticky session routing */
+s->route = NULL;/* Used for sticky session routing */
 
 /* Copy in function pointers (which are really methods) */
 s->start_response = ws_start_response;
@@ -2101,8 +2101,8 @@
 
 duration = apr_psprintf(r->pool, "%.1ld.%.6ld", seconds, 
micro);
 apr_table_setn(r->notes, JK_NOTE_REQUEST_DURATION, duration);
-if (s.jvm_route && *s.jvm_route)
-apr_table_setn(r->notes, JK_NOTE_WORKER_ROUTE, 
s.jvm_route);
+if (s.route && *s.route)
+apr_table_setn(r->notes, JK_NOTE_WORKER_ROUTE, s.route);
 
 request_log_transaction(r, xconf);
 }

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c?view=diff&rev=481770&r1=481769&r2=481770
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c Sun Dec  3 
04:55:56 2006
@@ -400,7 +400,7 @@
ajpv12_sendstring(p, s->server_name) &&
 #endif
ajpv12_sendint(p, s->server_port) && ajpv12_sendstring(p, 
s->protocol) && ajpv12_sendstring(p, 0) && /* SERVER_SIGNATURE */
-   ajpv12_sendstring(p, s->server_software) && ajpv12_sendstring(p, 
s->jvm_route) &&/* JSERV_ROUTE */
+   ajpv12_sendstring(p, s->server_software) && ajpv12_sendstring(p, 
s->route) &&/* J

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

[rjung]

Author: rjung
Date: Sun Dec  3 05:57:46 2006
New Revision: 481775

URL: http://svn.apache.org/viewvc?view=rev&rev=481775
Log:
Apache: Fix incorrect handling of JkEnvVar when Vars are set multiple times.
Allow omitting of default value (which means default is empty string).

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

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=481775&r1=481774&r2=481775
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Dec  3 05:57:46 
2006
@@ -1681,7 +1681,10 @@
   &jk_module);
 
 
-ap_table_add(conf->envvars, env_name, default_value);
+/* env_name is mandatory, default_value is optional.
+ * No value means set the variable to an empty string.
+ */
+ap_table_setn(conf->envvars, env_name, default_value ? default_value : "");
 
 return NULL;
 }
@@ -1843,8 +1846,9 @@
  * JkEnvVar let user defines envs var passed from WebServer to
  * Servlet Engine
  */
-{"JkEnvVar", jk_add_env_var, NULL, RSRC_CONF, TAKE2,
- "Adds a name of environment variable that should be sent to 
servlet-engine"},
+{"JkEnvVar", jk_add_env_var, NULL, RSRC_CONF, TAKE12,
+ "Adds a name of environment variable and an optional value "
+ "that should be sent to servlet-engine"},
 
 {"JkWorkerProperty", jk_set_worker_property, NULL, RSRC_CONF, RAW_ARGS,
  "Set workers.properties formated directive"},
@@ -2197,9 +2201,20 @@
 overrides->options |= (base->options & ~base->exclude_options);
 
 if (base->envvars_in_use) {
-overrides->envvars_in_use = JK_TRUE;
-overrides->envvars = ap_overlay_tables(p, overrides->envvars,
-   base->envvars);
+int i;
+const array_header *arr;
+const table_entry *elts;
+
+arr = ap_table_elts(base->envvars);
+if (arr) {
+overrides->envvars_in_use = JK_TRUE;
+elts = (const table_entry *)arr->elts;
+for (i = 0; i < arr->nelts; ++i) {
+if (!ap_table_get(overrides->envvars, elts[i].key)) {
+ap_table_setn(overrides->envvars, elts[i].key, 
elts[i].val);
+}
+}
+}
 }
 
 if (overrides->mount_file_reload == JK_UNSET)

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?view=diff&rev=481775&r1=481774&r2=481775
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Dec  3 05:57:46 
2006
@@ -1711,7 +1711,10 @@
 
 conf->envvars_in_use = JK_TRUE;
 
-apr_table_add(conf->envvars, env_name, default_value);
+/* env_name is mandatory, default_value is optional.
+ * No value means set the variable to an empty string.
+ */
+apr_table_setn(conf->envvars, env_name, default_value ? default_value : 
"");
 
 return NULL;
 }
@@ -1885,9 +1888,9 @@
  * JkEnvVar let user defines envs var passed from WebServer to
  * Servlet Engine
  */
-AP_INIT_TAKE2("JkEnvVar", jk_add_env_var, NULL, RSRC_CONF,
-  "Adds a name of environment variable that should be sent "
-  "to servlet-engine"),
+AP_INIT_TAKE12("JkEnvVar", jk_add_env_var, NULL, RSRC_CONF,
+  "Adds a name of environment variable and an optional value "
+  "that should be sent to servlet-engine"),
 
 AP_INIT_RAW_ARGS("JkWorkerProperty", jk_set_worker_property,
  NULL, RSRC_CONF,
@@ -2323,9 +2326,20 @@
 overrides->options |= (base->options & ~base->exclude_options);
 
 if (base->envvars_in_use) {
-overrides->envvars_in_use = JK_TRUE;
-overrides->envvars = apr_table_overlay(p, overrides->envvars,
-   base->envvars);
+int i;
+const apr_array_header_t *arr;
+const apr_table_entry_t *elts;
+
+arr = apr_table_elts(base->envvars);
+if (arr) {
+overrides->envvars_in_use = JK_TRUE;
+elts = (const apr_table_entry_t *)arr->elts;
+for (i = 0; i < arr->nelts; ++i) {
+if (!apr_table_get(overrides->envvars, elts[i].key)) {
+apr_table_setn(overrides->envvars, elts[i].ke

DO NOT REPLY [Bug 41096] - security problem with javamail

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





--- Additional Comments From [EMAIL PROTECTED]  2006-12-03 07:51 ---
As I stated previously, Bugzilla is not a support forum. You need to use the
users list.

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

Alternate compilers

[William L. Thomson Jr.]

Greetings,

With regard to compiling Tomcat. I just wanted to get a general feel
for how the core Tomcat devs feel about compiling Tomcat with
alternative jdks/compilers.

Seems there are issues with compiling say Tomcat 5.5.x with ibm jdks,
or when using ecj as the compiler. For example
http://issues.apache.org/bugzilla/show_bug.cgi?id=39562
https://bugs.gentoo.org/show_bug.cgi?id=157018

Are these issues the Tomcat devs care to resolve? Is Tomcat meant to be
compiled with a specific jdk/compiler like Sun's jdk? Is it looked down
upon to compile tomcat with other jdks? Will they be supported if there
are issues?

On Gentoo there is lots of choices. One might argue to much, and causes
issues or problems one would not normally run into. More so with Java
apps since even the FOSS Java world has gotten used to shipping and
distributing binaries. I just want to get a better idea of how upstream,
Tomcat devs, feel on this matter.

From an outside perspective it seems to have deps on sun jdks at times.
Like with regard to Tomcat 6.0.2 seems it does not depend on mx4j/jmx.
Since Sun 1.5 jdks provide that, but others don't have a jmx
implementation. So we will use mx4j as a dep. But that is not how Tomcat
binary will be built, and we will have a deviation there.

Thanks

-- 
William L. Thomson Jr.
Gentoo/Java


signature.asc
Description: This is a digitally signed message part

Re: Alternate compilers

[Bill Barker]

The IBM problem is likely a compiler bug, since with JSSE 1.0 available, 
those classes should be on the CP.  However, in 5.5, JSSE13SocketFactory is 
never used, so you could just exclude it.  And since it is difficult to use 
TC 3.x and 4.x on JVMs below 1.4, it might be time to get rid of support for 
JSSE 1.0.

The ecj problem looks like a bug in the way that it handles Generics, so 
there isn't much that Tomcat can do about it.

"William L. Thomson Jr." <[EMAIL PROTECTED]> wrote in message 
news:[EMAIL PROTECTED]

Greetings,

 With regard to compiling Tomcat. I just wanted to get a general feel
for how the core Tomcat devs feel about compiling Tomcat with
alternative jdks/compilers.

 Seems there are issues with compiling say Tomcat 5.5.x with ibm jdks,
or when using ecj as the compiler. For example
http://issues.apache.org/bugzilla/show_bug.cgi?id=39562
https://bugs.gentoo.org/show_bug.cgi?id=157018

 Are these issues the Tomcat devs care to resolve? Is Tomcat meant to be
compiled with a specific jdk/compiler like Sun's jdk? Is it looked down
upon to compile tomcat with other jdks? Will they be supported if there
are issues?

 On Gentoo there is lots of choices. One might argue to much, and causes
issues or problems one would not normally run into. More so with Java
apps since even the FOSS Java world has gotten used to shipping and
distributing binaries. I just want to get a better idea of how upstream,
Tomcat devs, feel on this matter.

 From an outside perspective it seems to have deps on sun jdks at times.
Like with regard to Tomcat 6.0.2 seems it does not depend on mx4j/jmx.
Since Sun 1.5 jdks provide that, but others don't have a jmx
implementation. So we will use mx4j as a dep. But that is not how Tomcat
binary will be built, and we will have a deviation there.

 Thanks

-- 
William L. Thomson Jr.
Gentoo/Java




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

svn commit: r482011 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/startup/TldConfig.java jasper/compiler/TldLocationsCache.java

[remm]

Author: remm
Date: Sun Dec  3 17:48:14 2006
New Revision: 482011

URL: http://svn.apache.org/viewvc?view=rev&rev=482011
Log:
- Update jar list in Jasper.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?view=diff&rev=482011&r1=482010&r2=482011
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Sun 
Dec  3 17:48:14 2006
@@ -63,20 +63,16 @@
 public final class TldConfig  {
 
 // Names of JARs that are known not to contain any TLDs
-private static HashSet noTldJars;
+private static HashSet noTldJars;
 
 private static org.apache.juli.logging.Log log=
 org.apache.juli.logging.LogFactory.getLog( TldConfig.class );
 
-private static final String FILE_URL_PREFIX = "file:";
-private static final int FILE_URL_PREFIX_LEN = FILE_URL_PREFIX.length();
-
-
 /*
  * Initializes the set of JARs that are known not to contain any TLDs
  */
 static {
-noTldJars = new HashSet();
+noTldJars = new HashSet();
 // Bootstrap JARs
 noTldJars.add("bootstrap.jar");
 noTldJars.add("commons-daemon.jar");
@@ -158,7 +154,7 @@
 
 private boolean rescan=true;
 
-private ArrayList listeners=new ArrayList();
+private ArrayList listeners = new ArrayList();
 
 // - Public Methods
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?view=diff&rev=482011&r1=482010&r2=482011
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java 
Sun Dec  3 17:48:14 2006
@@ -93,7 +93,7 @@
 private static final String JAR_FILE_SUFFIX = ".jar";
 
 // Names of JARs that are known not to contain any TLDs
-private static HashSet noTldJars;
+private static HashSet noTldJars;
 
 /**
  * The mapping of the 'global' tag library URI to the location (resource
@@ -115,48 +115,41 @@
  * Initializes the set of JARs that are known not to contain any TLDs
  */
 static {
-noTldJars = new HashSet();
-noTldJars.add("ant.jar");
+noTldJars = new HashSet();
+// Bootstrap JARs
+noTldJars.add("bootstrap.jar");
+noTldJars.add("commons-daemon.jar");
+noTldJars.add("tomcat-juli.jar");
+// Main JARs
+noTldJars.add("annotations-api.jar");
 noTldJars.add("catalina.jar");
 noTldJars.add("catalina-ant.jar");
-noTldJars.add("catalina-cluster.jar");
-noTldJars.add("catalina-optional.jar");
-noTldJars.add("catalina-i18n-fr.jar");
-noTldJars.add("catalina-i18n-ja.jar");
-noTldJars.add("catalina-i18n-es.jar");
+noTldJars.add("catalina-ha.jar");
+noTldJars.add("catalina-tribes.jar");
+noTldJars.add("el-api.jar");
+noTldJars.add("jasper.jar");
+noTldJars.add("jasper-el.jar");
+noTldJars.add("jasper-jdt.jar");
+noTldJars.add("jsp-api.jar");
+noTldJars.add("servlet-api.jar");
+noTldJars.add("tomcat-coyote.jar");
+noTldJars.add("tomcat-dbcp.jar");
+// i18n JARs
+noTldJars.add("tomcat-i18n-en.jar");
+noTldJars.add("tomcat-i18n-es.jar");
+noTldJars.add("tomcat-i18n-fr.jar");
+noTldJars.add("tomcat-i18n-ja.jar");
+// Misc JARs not included with Tomcat
+noTldJars.add("ant.jar");
 noTldJars.add("commons-dbcp.jar");
-noTldJars.add("commons-modeler.jar");
-noTldJars.add("commons-logging-api.jar");
 noTldJars.add("commons-beanutils.jar");
 noTldJars.add("commons-fileupload-1.0.jar");
 noTldJars.add("commons-pool.jar");
 noTldJars.add("commons-digester.jar");
 noTldJars.add("commons-logging.jar");
 noTldJars.add("commons-collections.jar");
-noTldJars.add("commons-el.jar");
-noTldJars.add("jakarta-regexp-1.2.jar");
-noTldJars.add("jasper-compiler.jar");
-noTldJars.add("jasper-runtime.jar");
 noTldJars.add("jmx.jar");
 noTldJars.add("jmx-tools.jar");
-noTldJars.add("jsp-api.jar");
-noTldJars.add("jkshm.jar");
-noTldJars.add("jkconfig.jar");
-noTldJars.add("naming-common.jar");
-noTldJars.add("na

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

[rjung]

Author: rjung
Date: Sun Dec  3 20:28:07 2006
New Revision: 482060

URL: http://svn.apache.org/viewvc?view=rev&rev=482060
Log:
Cleanup jk_util.c a little:
- num_of_wokers -> num_of_workers
- use "num" instead of "num_*" mostly
Add three more properties for use in status worker:
- prefix to define a prefix for the property output type
- good and bad rating to make the good and bad
  summary for lb in status worker configurable

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=482060&r1=482059&r2=482060
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Dec  3 20:28:07 2006
@@ -81,9 +81,12 @@
 #define NAMESPACE_OF_WORKER ("ns")
 #define XML_NAMESPACE_OF_WORKER ("xmlns")
 #define XML_DOCTYPE_OF_WORKER   ("doctype")
+#define PROP_PREFIX_OF_WORKER   ("prefix")
 
 #define READ_ONLY_OF_WORKER ("read_only")
 #define USER_OF_WORKER  ("user")
+#define GOOD_RATING_OF_WORKER   ("good")
+#define BAD_RATING_OF_WORKER("bad")
 
 #define DEFAULT_WORKER_TYPE JK_AJP13_WORKER_NAME
 #define SECRET_KEY_OF_WORKER("secretkey")
@@ -131,6 +134,8 @@
 BALANCE_WORKERS,
 MOUNT_OF_WORKER,
 USER_OF_WORKER,
+GOOD_RATING_OF_WORKER,
+BAD_RATING_OF_WORKER,
 "list",
 NULL
 };
@@ -174,6 +179,7 @@
 NAMESPACE_OF_WORKER,
 XML_NAMESPACE_OF_WORKER,
 XML_DOCTYPE_OF_WORKER,
+PROP_PREFIX_OF_WORKER,
 NULL
 };
 
@@ -804,19 +810,19 @@
 return jk_map_get_string(m, buf, NULL);
 }
 
-int jk_get_worker_list(jk_map_t *m, char ***list, unsigned *num_of_wokers)
+int jk_get_worker_list(jk_map_t *m, char ***list, unsigned *num_of_workers)
 {
-if (m && list && num_of_wokers) {
+if (m && list && num_of_workers) {
 char **ar = jk_map_get_string_list(m,
 WORKER_LIST_PROPERTY_NAME,
-num_of_wokers,
+num_of_workers,
 DEFAULT_WORKER);
 if (ar) {
 *list = ar;
 return JK_TRUE;
 }
 *list = NULL;
-*num_of_wokers = 0;
+*num_of_workers = 0;
 }
 
 return JK_FALSE;
@@ -1049,6 +1055,16 @@
 return jk_map_get_string(m, buf, def);
 }
 
+const char *jk_get_worker_prop_prefix(jk_map_t *m, const char *wname, const 
char *def)
+{
+char buf[1024];
+if (!m || !wname) {
+return NULL;
+}
+MAKE_WORKER_PARAM(PROP_PREFIX_OF_WORKER);
+return jk_map_get_string(m, buf, def);
+}
+
 int jk_get_is_read_only(jk_map_t *m, const char *wname)
 {
 int rc = JK_FALSE;
@@ -1065,21 +1081,65 @@
 
 int jk_get_worker_user_list(jk_map_t *m,
 const char *wname,
-char ***list, unsigned int *num_of_users)
+char ***list, unsigned int *num)
 {
 char buf[1024];
 
-if (m && list && num_of_users && wname) {
+if (m && list && num && wname) {
 char **ar = NULL;
 
 MAKE_WORKER_PARAM(USER_OF_WORKER);
-ar = jk_map_get_string_list(m, buf, num_of_users, NULL);
+ar = jk_map_get_string_list(m, buf, num, NULL);
+if (ar) {
+*list = ar;
+return JK_TRUE;
+}
+*list = NULL;
+*num = 0;
+}
+
+return JK_FALSE;
+}
+
+int jk_get_worker_good_rating(jk_map_t *m,
+  const char *wname,
+  char ***list, unsigned int *num)
+{
+char buf[1024];
+
+if (m && list && num && wname) {
+char **ar = NULL;
+
+MAKE_WORKER_PARAM(GOOD_RATING_OF_WORKER);
+ar = jk_map_get_string_list(m, buf, num, NULL);
+if (ar) {
+*list = ar;
+return JK_TRUE;
+}
+*list = NULL;
+*num = 0;
+}
+
+return JK_FALSE;
+}
+
+int jk_get_worker_bad_rating(jk_map_t *m,
+ const char *wname,
+ char ***list, unsigned int *num)
+{
+char buf[1024];
+
+if (m && list && num && wname) {
+char **ar = NULL;
+
+MAKE_WORKER_PARAM(BAD_RATING_OF_WORKER);
+ar = jk_map_get_string_list(m, buf, num, NULL);
 if (ar) {
 *list = ar;
 return JK_TRUE;
 }
 *list = NULL;
-*num_of_users = 0;
+*num = 0;
 }
 
 return JK_FALSE;
@@ -1087,28 +1147,28 @@
 
 int jk_get_lb_worker_list(jk_map_t *m,
   const char *wname,
-  char ***list, unsigned int *num_of_wokers)
+  char ***list, u

svn commit: r482072 [1/2] - /tomcat/connectors/trunk/jk/native/common/jk_status.c

[rjung]

Author: rjung
Date: Sun Dec  3 20:57:49 2006
New Revision: 482072

URL: http://svn.apache.org/viewvc?view=rev&rev=482072
Log:
Further improvements for the status worker:
- New output style "mime=prop" for property type output.
  Format includes lines for attributes mount, balance_workers, list
- New cmd=version (only shows version numbers, no worker data)
- New lb view without sub workers (add "opt=nosw")
- good/bad/degraded: the mapping of (activation,state) to good/bad
  is now configurable
- Renamed request param att -> opt
- Renamed some DEF constants
- Added Headings (Legend, LB list, AJP list)
- Fixed copyright placement as page footer
- consistent grouping of lb and non-lb workers for cmd=list
  for all mime types
- Added id to map display, because we have no other primary key for maps
- Changed description of N/A in legend to "Unknown", because "Not Available"
  was misleading.
- Some more Logging 
- Automatic handling of the "opt" request attribute
- More and consistent navigation
- Use more string constants instead of jk_p(uts|utv|rintf)
- Utility functions for xml and property output
- Better parameter validation
- Killed a bit of redundant code across mime types (still much left)
- renamed logger log to l

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


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

DO NOT REPLY [Bug 41072] - tomcat (3.x/4.x/5.x/6.x) is not supporting http(1.0/1.1) CONNECT method.

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





--- Additional Comments From [EMAIL PROTECTED]  2006-12-03 21:07 ---
Hi All
   Tomcat (3.x/4.x/5.x/6.x) is not supporting http(1.0/1.1) CONNECT 
method. I \
dont know why its not supporting this feature which is offering a robust \
communication using HTTP1.0/1.1 Proxying concepts for realstreamings like VNC, 
RDP \
etc based products. I have been working with tomcat from last 5 months. I have 
\
developed this support(http CONNECT method) and using in my "Post graduation 
Project \
work" its a "Remote Desktop Management project"  and which is working fine.   
Now i would like you guys to confirm that 'am i doing right'?.

   Implementation details :-
   
   Inside coyote package, we have class called HttpProcessor.class. Its \
resposible for processing the http request and where we can identify the which 
type \
of the http request being processed. Then i have added a functionality that 
will \
parse and handle Http CONNECT method as if Http Proxy Impl with Basic 
authentication \
support.

  Can you guys please confirm this?

Thanks & Regards
PC Varma


-- 
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: r482084 - in /tomcat/connectors/trunk/jk/xdocs: config/workers.xml miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Sun Dec  3 21:26:26 2006
New Revision: 482084

URL: http://svn.apache.org/viewvc?view=rev&rev=482084
Log:
Update docs and changelog with last status worker extensions.

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

Modified: tomcat/connectors/trunk/jk/xdocs/config/workers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/workers.xml?view=diff&rev=482084&r1=482083&r2=482084
==
--- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/workers.xml Sun Dec  3 21:26:26 2006
@@ -381,10 +381,69 @@
 
 
 
-This directive can be used mutltiple times. It is a list of users
+It is a list of users
 which gets compared to the user name authenticated by the web server.
 If the name is not contained in this list, access is denied. Per
 default the list is empty and then access is allowed to anybody.
+
+This directive can be used multiple times.
+
+
+This feature has been added in jk 1.2.20.
+
+
+
+For every load balancer worker, the status worker shows a summary
+of the state of its members. There are three such states,
+"good", "bad" and "degraded".
+
+These states are determined depending on the activation of the members
+(active, disabled, stopped) and their runtime state
+(ok, n/a, busy, recovering, error).
+By default, members are assumed to be "good", if their activation
+is "active" and their runtime state is not "error".
+
+
+You can change this mapping, by assigning a list of values to the
+attribute "good". Each value gives a possible match for the members,
+and one match suffices. Each value is either a single character, or two
+characters combined with a dot ".". The single characters are the
+first characters in the words "active", "disabled", "stopped",
+"ok", "na", "busy", "recovering", "error". If a value consists only
+of a single character, then all members with this activation or runtime
+state will be assumed good. A combination of an activation and a runtime
+state concatenated with a dot "." does only apply to a member, that has
+exactly this activation and state.
+
+
+Members of a load balancer will first be matched against the state "bad",
+if they don't match, the state "good" will be tried, and if they
+still don't match, their state will be "degraded".
+
+
+This directive can be used multiple times.
+
+
+This feature has been added in jk 1.2.20.
+
+
+
+See: "good".
+
+By default, members are assumed to be "bad", if their activation
+is "stopped" or their runtime state is "error".
+
+
+This directive can be used multiple times.
+
+
+This feature has been added in jk 1.2.20.
+
+
+
+The prefix, which will be used by the status worker
+when producing properties output (mime=prop).
+Each property keyy will be prefixed by this value.
 
 This feature has been added in jk 1.2.20.
 

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=482084&r1=482083&r2=482084
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Dec  3 
21:26:26 2006
@@ -26,6 +26,19 @@
   
   
 
+  
+  Status Worker: Add directive to make property prefix
+  and good/bad rule configurable. (rjung)
+  
+  
+  Status Worker: Omit lb members when att=nosw. (rjung)
+  
+  
+  Status Worker: New command cmd=version for a short version output. 
(rjung)
+  
+  
+  Status Worker: New output stype mime=prop produces property lists. 
(rjung)
+  
   
   Apache: Fix incorrect handling of JkEnvVar when Vars are set multiple 
times. (rjung)
   



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

svn commit: r482086 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

[rjung]

Author: rjung
Date: Sun Dec  3 21:32:36 2006
New Revision: 482086

URL: http://svn.apache.org/viewvc?view=rev&rev=482086
Log:
Fix a couple of compiler warnings.

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=482086&r1=482085&r2=482086
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Dec  3 21:32:36 
2006
@@ -388,9 +388,9 @@
 return rc;
 }
 
-static int jk_print_xml_start_elt(jk_ws_service_t *s, status_worker_t *sw,
-  int indentation, int close_tag,
-  const char *name)
+static void jk_print_xml_start_elt(jk_ws_service_t *s, status_worker_t *sw,
+   int indentation, int close_tag,
+   const char *name)
 {
 if (close_tag) {
 jk_printf(s, "%*s<%s%s>\n", indentation, "", sw->ns, name);
@@ -400,15 +400,15 @@
 }
 }
 
-static int jk_print_xml_close_elt(jk_ws_service_t *s, status_worker_t *sw,
-  int indentation,
-  const char *name)
+static void jk_print_xml_close_elt(jk_ws_service_t *s, status_worker_t *sw,
+   int indentation,
+   const char *name)
 {
 jk_printf(s, "%*s\n", indentation, "", sw->ns, name);
 }
 
-static int jk_print_xml_stop_elt(jk_ws_service_t *s,
- int indentation, int close_tag)
+static void jk_print_xml_stop_elt(jk_ws_service_t *s,
+  int indentation, int close_tag)
 {
 if (close_tag) {
 jk_printf(s, "%*s/>\n", indentation, "");
@@ -418,44 +418,44 @@
 }
 }
 
-static int jk_print_xml_att_string(jk_ws_service_t *s,
-   int indentation,
-   const char *key, const char *value)
+static void jk_print_xml_att_string(jk_ws_service_t *s,
+int indentation,
+const char *key, const char *value)
 {
 jk_printf(s, "%*s%s=\"%s\"\n", indentation, "", key, value ? value : "");
 }
 
-static int jk_print_xml_att_int(jk_ws_service_t *s,
-int indentation,
-const char *key, int value)
+static void jk_print_xml_att_int(jk_ws_service_t *s,
+ int indentation,
+ const char *key, int value)
 {
 jk_printf(s, "%*s%s=\"%d\"\n", indentation, "", key, value);
 }
 
-static int jk_print_xml_att_uint(jk_ws_service_t *s,
- int indentation,
- const char *key, unsigned value)
+static void jk_print_xml_att_uint(jk_ws_service_t *s,
+  int indentation,
+  const char *key, unsigned value)
 {
 jk_printf(s, "%*s%s=\"%u\"\n", indentation, "", key, value);
 }
 
-static int jk_print_xml_att_uint32(jk_ws_service_t *s,
-   int indentation,
-   const char *key, jk_uint32_t value)
+static void jk_print_xml_att_uint32(jk_ws_service_t *s,
+int indentation,
+const char *key, jk_uint32_t value)
 {
 jk_printf(s, "%*s%s=\"%" JK_UINT32_T_FMT "\"\n", indentation, "", key, 
value);
 }
 
-static int jk_print_xml_att_uint64(jk_ws_service_t *s,
-   int indentation,
-   const char *key, jk_uint64_t value)
+static void jk_print_xml_att_uint64(jk_ws_service_t *s,
+int indentation,
+const char *key, jk_uint64_t value)
 {
 jk_printf(s, "%*s%s=\"%" JK_UINT64_T_FMT "\"\n", indentation, "", key, 
value);
 }
 
-static int jk_print_prop_att_string(jk_ws_service_t *s, status_worker_t *sw,
-const char *name,
-const char *key, const char *value)
+static void jk_print_prop_att_string(jk_ws_service_t *s, status_worker_t *sw,
+ const char *name,
+ const char *key, const char *value)
 {
 if (name) {
 jk_printf(s, "%s.%s.%s=%s\n", sw->prefix, name, key, value ? value : 
"");
@@ -465,9 +465,9 @@
 }
 }
 
-static int jk_print_prop_att_int(jk_ws_service_t *s, status_worker_t *sw,
- const char *name,
- const char *key, int value)
+static void jk_print_prop_att_int(jk_ws_service_t *s, status_wor

Endorsed directory path incorrect- setclasspath.sh bug?

[S_Ewing]

The Tomcat 6 classloader documentation
(http://tomcat.apache.org/tomcat-6.0-doc/class-loader-howto.html) says
"Tomcat utilizes this mechanism by including the system property setting
-Djava.endorsed.dirs=$CATALINA_HOME/endorsed in the command line that starts
the container."

However the Tomcat 6.0.2 setclasspath.sh has:

JAVA_ENDORSED_DIRS="$BASEDIR"/common/endorsed

Is this a bug in the script? There is no common directory in Tomcat 6.

/s
-- 
View this message in context: 
http://www.nabble.com/Endorsed-directory-path-incorrect--setclasspath.sh-bug--tf2749545.html#a7671206
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


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

DO NOT REPLY [Bug 40677] - PKCS11 keystore instead of JKS or PKCS12 keystore

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





--- Additional Comments From [EMAIL PROTECTED]  2006-12-03 22:37 ---
see also Bug 37018

-- 
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 37018] - Document how to use tomcat-SSL with a pkcs11 token

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


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEEDINFO|ASSIGNED




--- Additional Comments From [EMAIL PROTECTED]  2006-12-03 22:37 ---
some aspect of this is dealt with in bug 40677

-- 
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: r482090 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

[mturk]

Author: mturk
Date: Sun Dec  3 23:01:24 2006
New Revision: 482090

URL: http://svn.apache.org/viewvc?view=rev&rev=482090
Log:
Always display Legend in listing.
Fix tags and display warning when worker mount size is zero.

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=482090&r1=482089&r2=482090
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Dec  3 23:01:24 
2006
@@ -971,6 +971,20 @@
 int count=0;
 
 JK_TRACE_ENTER(l);
+for (i = 0; i < uwmap->size; i++) {
+uri_worker_record_t *uwr = uwmap->maps[i];
+if (!worker || strcmp(uwr->worker_name, worker)) {
+continue;
+}
+count++;
+}
+if (!count) {
+jk_putv(s, "Warning: No URI Mappings defined for ",
+worker, " !\n", NULL);
+JK_TRACE_EXIT(l);
+return;
+}
+count = 0;
 jk_putv(s, "URI Mappings for ", worker, "\n", NULL);
 jk_puts(s, "\n");
 jk_printf(s, JK_STATUS_TABLE_HEAD_3_STRING,
@@ -1029,7 +1043,8 @@
 jk_print_xml_att_string(s, 10, "source", 
uri_worker_map_get_source(uwr, l));
 jk_print_xml_stop_elt(s, 8, 1);
 }
-jk_print_xml_close_elt(s, sw, 6, "maps");
+if (count)
+jk_print_xml_close_elt(s, sw, 6, "maps");
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
"dumped %d maps for worker '%s'",
@@ -2502,9 +2517,11 @@
 else if (mime == JK_STATUS_MIME_PROP) {
 jk_print_prop_att_int(s, sw, NULL, "lb_cnt", count);
 }
+#if 0
 else {
 jk_printf(s, "Listing %d load balancing worker%s\n", 
count, count>1 ? "s" : "");
 }
+#endif
 }
 else {
 if (mime == JK_STATUS_MIME_XML) {
@@ -2551,6 +2568,13 @@
 if (list_lb) {
 if (mime == JK_STATUS_MIME_XML) {
 jk_print_xml_close_elt(s, sw, 0, "balancers");
+}
+else if (mime == JK_STATUS_MIME_TXT) {
+}
+else if (mime == JK_STATUS_MIME_PROP) {
+}
+else {
+display_legend(s, sw, l);
 }
 }
 else {



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

Bug report for Tomcat 3 [2006/12/03]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
| 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt|
| 5331|Ass|Nor|2001-12-09|getPathInfo vs URL normalization  |
| 6027|Inf|Maj|2002-01-25|Tomcat  Automatically shuts down as service   |
| 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c|
| 7785|Inf|Blk|2002-04-06|tomcat bug in context reloading   |
| 7863|Inf|Maj|2002-04-09|I have a problem when running Tomcat with IIS |
| 8187|Inf|Cri|2002-04-17|Errors when Tomcat used with MS Access database   |
| 9737|Ver|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p|
|10047|Ass|Cri|2002-06-20|IllegalStateException |
|10406|Ass|Cri|2002-07-02|IllegalStateException |
|11087|Inf|Blk|2002-07-23|IllegalStateException |
|12156|Inf|Cri|2002-08-29|Apache and Tomcat 3.3.1 Interworking problem  |
|16363|Ass|Cri|2003-01-23|Stack Overflow accessing compiled JSP - Tomcat 3.2|
|39250|Inf|Cri|2006-04-07|Tomcat 3.2.1 + JDK 1.4|
+-+---+---+--+--+
| Total   14 bugs   |
+---+

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

Bug report for Tomcat 4 [2006/12/03]

[bugzilla]

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

Bug report for Watchdog [2006/12/03]

[bugzilla]

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

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

Bug report for Tomcat 5 [2006/12/03]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=CriticalMAJ=Major |
| |   |   MIN=Minor   NOR=Normal  ENH=Enhancement   |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|22679|Ver|Enh|2003-08-24|how to access ssl session ID out of tomcat to prev|
|28039|New|Enh|2004-03-30|Cluster Support for SingleSignOn  |
|28634|Ass|Enh|2004-04-27|Extend StandardManager/StandardSession for DeltaMa|
|29160|Ver|Enh|2004-05-23|precompile problem: _jspx_meth_* (javax.servlet.js|
|29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi|
|30241|Ver|Enh|2004-07-21|Enhance build script to use branch argument when c|
|33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis|
|33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps|
|33650|Inf|Enh|2005-02-19|Jasper performance for multiple files processing  |
|33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na|
|34319|New|Enh|2005-04-06|StoreBase.processExpires() is very inefficient|
|34643|New|Enh|2005-04-27|document how to use certificate-based "clientAuth"|
|34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a|
|34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern|
|34868|New|Enh|2005-05-11|allow to register a trust store for a session that|
|35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc|
|35079|Inf|Enh|2005-05-26|Should be able to specify DNS lookup timeout  |
|35229|Opn|Enh|2005-06-05|alert user about expired certificates in client ce|
|35552|Inf|Enh|2005-06-29|JMS destination under|
|35746|Inf|Enh|2005-07-14|session manager should be immune to system clock t|
|35765|New|Enh|2005-07-16|make the SSL cipher config in server.xml fail safe|
|35869|New|Enh|2005-07-26|Can't run as a service on Windows Server 2003 64-B|
|36133|Inf|Enh|2005-08-10|Support JSS SSL implementation|
|36169|New|Enh|2005-08-12|[PATCH] Enable chunked encoding for IIS JK connect|
|36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi|
|36365|New|Blk|2005-08-26|IIS5.1-isapi_redirector.dll (1.2.14) plugin issue |
|36540|Inf|Enh|2005-09-07|pooled cluster replication does not seem ensure sy|
|36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's   |
|36630|Opn|Maj|2005-09-13|Error instantiating servlet class |
|36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re|
|36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing  |
|36923|New|Nor|2005-10-05|Deactivated EL expressions are not parsed for jsp |
|37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token|
|37072|New|Nor|2005-10-13|Encoding mismatch in error condition  |
|37138|New|Enh|2005-10-18|Allow to specify a security provider (priority lis|
|37326|Ass|Nor|2005-11-01|No error reported when  has non-exist|
|37334|New|Enh|2005-11-02|Realm digest property not aligned with the adminis|
|37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user  |
|37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre|
|37498|Inf|Nor|2005-11-14|[PATCH] NPE in org.apache.catalina.core.ContainerB|
|37515|Inf|Nor|2005-11-15|smap not generated by JspC when used from Ant for |
|37627|Opn|Nor|2005-11-24|Slow and incomplete dynamic content generation aft|
|37674|New|Nor|2005-11-29|Windows EXE fails to pass spaces in JVMTI -javaage|
|37785|New|Nor|2005-12-05|Changing startup type via Tomcat Monitor does not |
|37797|New|Maj|2005-12-05|Configure Tomcat utility truncates classpath to 96|
|37822|Opn|Nor|2005-12-07|WebappClassLoader interfering with Catalina core c|
|37834|Ass|Nor|2005-12-08|compressableMimeTypes not working properly|
|37847|Ass|Enh|2005-12-09|Allow User To Optionally Specify Catalina Output F|
|37869|New|Nor|2005-12-12|Cannot obtain client certificate with SSL / client|
|37882|New|Blk|2005-12-13|ClassCircularityError when principal included in s|
|37918|Ass|Nor|2005-12-15|EL cannot find valid getter from object when using|
|37943|New|Maj|2005-12-16|Dep

svn commit: r482093 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

[mturk]

Author: mturk
Date: Sun Dec  3 23:11:47 2006
New Revision: 482093

URL: http://svn.apache.org/viewvc?view=rev&rev=482093
Log:
Use & instead & directly.

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=482093&r1=482092&r2=482093
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Dec  3 23:11:47 
2006
@@ -900,21 +900,21 @@
 jk_putv(s, s->req_uri, "?", JK_STATUS_ARG_CMD, "=",
 status_cmd_text(cmd), NULL);
 if (mime)
-jk_putv(s, "&", JK_STATUS_ARG_MIME, "=",
+jk_putv(s, "&", JK_STATUS_ARG_MIME, "=",
 status_mime_text(mime), NULL);
 if (from)
-jk_putv(s, "&", JK_STATUS_ARG_FROM, "=",
+jk_putv(s, "&", JK_STATUS_ARG_FROM, "=",
 status_cmd_text(from), NULL);
 if (refresh)
-jk_printf(s, "&%s=%d", JK_STATUS_ARG_REFRESH, refresh);
+jk_printf(s, "&%s=%d", JK_STATUS_ARG_REFRESH, refresh);
 if (worker)
-jk_putv(s, "&", JK_STATUS_ARG_WORKER, "=",
+jk_putv(s, "&", JK_STATUS_ARG_WORKER, "=",
 worker, NULL);
 if (sub_worker)
-jk_putv(s, "&", JK_STATUS_ARG_WORKER_MEMBER, "=",
+jk_putv(s, "&", JK_STATUS_ARG_WORKER_MEMBER, "=",
 sub_worker, NULL);
 if (option)
-jk_putv(s, "&", JK_STATUS_ARG_OPTION, "=",
+jk_putv(s, "&", JK_STATUS_ARG_OPTION, "=",
 option, NULL);
 }
 if (text)



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

svn commit: r482096 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

[mturk]

Author: mturk
Date: Sun Dec  3 23:41:37 2006
New Revision: 482096

URL: http://svn.apache.org/viewvc?view=rev&rev=482096
Log:
Display version info for cmd=show as well.

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=482096&r1=482095&r2=482096
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Dec  3 23:41:37 
2006
@@ -3160,12 +3160,13 @@
 jk_printf(s, ":%d", s->server_port);
 jk_puts(s, "\n\n");
 if ((cmd == JK_STATUS_CMD_LIST) ||
+(cmd == JK_STATUS_CMD_SHOW) ||
 (cmd == JK_STATUS_CMD_VERSION)) {
 jk_putv(s, "Server Version:",
 s->server_software, "\n", NULL);
 jk_putv(s, "JK Version:",
 JK_EXPOSED_VERSION, "\n", NULL);
-jk_puts(s, "");
+jk_puts(s, "\n");
 }
 if (cmd == JK_STATUS_CMD_LIST ||
 cmd == JK_STATUS_CMD_SHOW) {
@@ -3215,7 +3216,6 @@
 "\" type=\"text\" size=\"3\" value=\"10\"/> "
 "seconds)", NULL);
 jk_puts(s, "\n");
-jk_puts(s, "\n");
 }
 }
 if (cmd == JK_STATUS_CMD_SHOW ||



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

svn commit: r482098 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

[mturk]

Author: mturk
Date: Sun Dec  3 23:54:39 2006
New Revision: 482098

URL: http://svn.apache.org/viewvc?view=rev&rev=482098
Log:
Make default 3 seconds refresh delay compile time configurable.

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=482098&r1=482097&r2=482098
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Dec  3 23:54:39 
2006
@@ -135,6 +135,7 @@
 #define JK_STATUS_MASK_GOOD_DEF0x000F
 #define JK_STATUS_MASK_BAD_DEF 0x00FF1010
 
+#define JK_STATUS_REFRESH  "3"
 #define JK_STATUS_ESC_CHARS("<>?&")
 
 #define JK_STATUS_HEAD "");
 if (!err) {
-jk_putv(s, "Result: OK - You will be redirected in 3 
seconds.", NULL);
+jk_puts(s, "Result: OK - You will be redirected in "
+JK_STATUS_REFRESH " seconds.");
 }
 }
 }
@@ -3062,12 +3065,14 @@
 /* unlock the shared memory */
 jk_shm_unlock();
 if (mime == JK_STATUS_MIME_HTML) {
-jk_puts(s, "\n");
 if (!err) {
-jk_putv(s, "Result: OK - You will be redirected in 3 
seconds.", NULL);
+jk_puts(s, "Result: OK - You will be redirected in "
+JK_STATUS_REFRESH " seconds.");
 }
 }
 }



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