svn commit: r479311 - /tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c

[rjung]

Author: rjung
Date: Sun Nov 26 00:52:44 2006
New Revision: 479311

URL: http://svn.apache.org/viewvc?view=rev&rev=479311
Log:
Untabify.

Modified:
tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c

Modified: tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c?view=diff&rev=479311&r1=479310&r2=479311
==
--- tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c (original)
+++ tomcat/connectors/trunk/jk/native/nt_service/jk_nt_service.c Sun Nov 26 
00:52:44 2006
@@ -1001,8 +1001,8 @@
 
 memset(&processInformation, 0, 
sizeof(processInformation));
 
-   if( cmdLine==NULL ) 
-   cmdLine=data.cmd_line;
+if( cmdLine==NULL ) 
+cmdLine=data.cmd_line;
 
 printf(cmdLine);
 if(CreateProcess(data.java_bin,
@@ -1024,7 +1024,7 @@
 shutdown_port = data.shutdown_port;
 shutdown_secret = data.shutdown_secret;
 shutdown_protocol = strdup(data.shutdown_protocol);
-   shutdown_cmd = 
strdup(data.stop_cmd);
+shutdown_cmd = strdup(data.stop_cmd);
 
 return JK_TRUE;
 } else {



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

svn commit: r479312 - /tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c

[rjung]

Author: rjung
Date: Sun Nov 26 00:54:36 2006
New Revision: 479312

URL: http://svn.apache.org/viewvc?view=rev&rev=479312
Log:
Untabify

Modified:
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c

Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?view=diff&rev=479312&r1=479311&r2=479312
==
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Sun Nov 26 
00:54:36 2006
@@ -300,8 +300,8 @@
 jk_close_file_logger(&logger);
 }
 
-   if (init_map) {
-jk_map_free(&init_map);
+if (init_map) {
+jk_map_free(&init_map);
 }
 }
 
@@ -413,7 +413,7 @@
 s->headers_names = NULL;
 s->headers_values = NULL;
 s->num_headers = 0;
-   s->uw_map = uw_map;
+s->uw_map = uw_map;
 
 #ifdef NETWARE
 /* on NetWare, we can have virtual servers that are secure.



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

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

[rjung]

Author: rjung
Date: Sun Nov 26 00:59:48 2006
New Revision: 479313

URL: http://svn.apache.org/viewvc?view=rev&rev=479313
Log:
- Remove unused function declaration
- Add new config options, used for the status worker:
  - css (this one existed before, but was configured
using the general property mechanism)
  - read_only (inhibits changing configs via status worker)
  - user (list of users allowed to use status worker,
in case our web server doesn't have pretty auth features,
maybe interesting when used with IIS)
Caution: these are only the config functions.
Implementing the features read_only and user
follows in a later commit.

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=479313&r1=479312&r2=479313
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Nov 26 00:59:48 2006
@@ -76,7 +76,9 @@
 #define ACTIVATION_OF_WORKER("activation")
 #define WORKER_RECOVER_TIME ("recover_time")
 #define WORKER_MAX_PACKET_SIZE  ("max_packet_size")
-
+#define STYLE_SHEET_OF_WORKER   ("css")
+#define READ_ONLY_OF_WORKER ("read_only")
+#define USER_OF_WORKER  ("user")
 
 #define DEFAULT_WORKER_TYPE JK_AJP13_WORKER_NAME
 #define SECRET_KEY_OF_WORKER("secretkey")
@@ -123,6 +125,7 @@
 static const char *list_properties[] = {
 BALANCE_WORKERS,
 MOUNT_OF_WORKER,
+USER_OF_WORKER,
 "list",
 NULL
 };
@@ -158,6 +161,8 @@
 ACTIVATION_OF_WORKER,
 WORKER_RECOVER_TIME,
 WORKER_MAX_PACKET_SIZE,
+STYLE_SHEET_OF_WORKER,
+READ_ONLY_OF_WORKER,
 RETRIES_OF_WORKER,
 WORKER_MAINTAIN_PROPERTY_NAME,
 NULL
@@ -972,6 +977,55 @@
 sz = 64*1024;
 
 return sz;
+}
+
+const char *jk_get_worker_style_sheet(jk_map_t *m, const char *wname, const 
char *def)
+{
+char buf[1024];
+
+if (!m || !wname) {
+return NULL;
+}
+
+MAKE_WORKER_PARAM(STYLE_SHEET_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;
+char buf[1024];
+if (m && wname) {
+int value;
+MAKE_WORKER_PARAM(READ_ONLY_OF_WORKER);
+value = jk_map_get_bool(m, buf, 0);
+if (value)
+rc = JK_TRUE;
+}
+return rc;
+}
+
+int jk_get_worker_user_list(jk_map_t *m,
+const char *wname,
+char ***list, unsigned int *num_of_users)
+{
+char buf[1024];
+
+if (m && list && num_of_users && wname) {
+char **ar = NULL;
+
+MAKE_WORKER_PARAM(USER_OF_WORKER);
+ar = jk_map_get_string_list(m, buf, num_of_users, NULL);
+if (ar) {
+*list = ar;
+return JK_TRUE;
+}
+*list = NULL;
+*num_of_users = 0;
+}
+
+return JK_FALSE;
 }
 
 int jk_get_lb_worker_list(jk_map_t *m,

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?view=diff&rev=479313&r1=479312&r2=479313
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Sun Nov 26 00:59:48 2006
@@ -98,8 +98,6 @@
 
 int jk_get_worker_activation(jk_map_t *m, const char *wname);
 
-void jk_set_log_format(const char *logformat);
-
 int jk_get_worker_list(jk_map_t *m, char ***list, unsigned *num_of_wokers);
 
 int jk_get_lb_factor(jk_map_t *m, const char *wname);
@@ -170,6 +168,14 @@
 int jk_get_worker_maintain_time(jk_map_t *m);
 
 int jk_get_max_packet_size(jk_map_t *m, const char *wname);
+
+const char *jk_get_worker_style_sheet(jk_map_t *m, const char *wname, const 
char *def);
+
+int jk_get_is_read_only(jk_map_t *m, const char *wname);
+
+int jk_get_worker_user_list(jk_map_t *m,
+const char *wname,
+char ***list, unsigned int *num_of_users);
 
 #define TC32_BRIDGE_TYPE32
 #define TC33_BRIDGE_TYPE33



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

svn commit: r479314 - in /tomcat/connectors/trunk/jk/native/common: jk_lb_worker.c jk_lb_worker.h

[rjung]

Author: rjung
Date: Sun Nov 26 01:04:47 2006
New Revision: 479314

URL: http://svn.apache.org/viewvc?view=rev&rev=479314
Log:
- Adding a new constant, used later in
  the status worker.
- Adding two new useful debug messages.
- removed trailing white space.

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?view=diff&rev=479314&r1=479313&r2=479314
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sun Nov 26 01:04:47 
2006
@@ -172,6 +172,10 @@
 /* Syncing config values from shm */
 void jk_lb_pull(lb_worker_t * p, jk_logger_t *l) {
 JK_TRACE_ENTER(l);
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "syncing mem for lb '%s' from shm",
+   p->s->name);
 p->sticky_session = p->s->sticky_session;
 p->sticky_session_force = p->s->sticky_session_force;
 p->recover_wait_time = p->s->recover_wait_time;
@@ -185,6 +189,10 @@
 /* Syncing config values from shm */
 void jk_lb_push(lb_worker_t * p, jk_logger_t *l) {
 JK_TRACE_ENTER(l);
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG,
+   "syncing shm for lb '%s' from mem",
+   p->s->name);
 p->s->sticky_session = p->sticky_session;
 p->s->sticky_session_force = p->sticky_session_force;
 p->s->recover_wait_time = p->recover_wait_time;
@@ -441,7 +449,7 @@
JK_LB_DECAY_MULT * delta / lb->maintain_time);
 curmax = decay_load(lb, JK_LB_DECAY_MULT * delta / 
lb->maintain_time, l);
 if (!recover_workers(lb, curmax, now, l)) {
-force_recovery(lb, l);
+force_recovery(lb, l);
 }
 }
 
@@ -1018,7 +1026,7 @@
 else {
 /* No workers in error state.
  * Somebody set them all to disabled?
- */
+ */
 jk_log(l, JK_LOG_ERROR,
"All tomcat instances failed, no more workers left 
for recovery");
 *is_error = JK_HTTP_SERVER_BUSY;
@@ -1176,7 +1184,7 @@
 p->lb_workers[i].s->lb_value = 0;
 p->lb_workers[i].s->state = JK_LB_STATE_NA;
 p->lb_workers[i].s->error_time = 0;
-p->lb_workers[i].s->activation = 
+p->lb_workers[i].s->activation =
 jk_get_worker_activation(props, worker_names[i]);
 if (!wc_create_worker(p->lb_workers[i].s->name, 0,
   props,
@@ -1206,7 +1214,7 @@
 if (id_domain) {
 *id_domain = '\0';
 strcpy(p->lb_workers[i].s->domain, 
p->lb_workers[i].s->jvm_route);
-*id_domain = '.';
+*id_domain = '.';
 }
 }
 if (JK_IS_DEBUG_LEVEL(l)) {

Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h?view=diff&rev=479314&r1=479313&r2=479314
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Sun Nov 26 01:04:47 
2006
@@ -70,6 +70,7 @@
 #define JK_LB_ACTIVATION_ACTIVE(1)
 #define JK_LB_ACTIVATION_DISABLED  (2)
 #define JK_LB_ACTIVATION_STOPPED   (3)
+#define JK_LB_ACTIVATION_MAX   (JK_LB_ACTIVATION_STOPPED)
 #define JK_LB_ACTIVATION_TEXT_ACTIVE   ("ACT")
 #define JK_LB_ACTIVATION_TEXT_DISABLED ("DIS")
 #define JK_LB_ACTIVATION_TEXT_STOPPED  ("STP")



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

svn commit: r479317 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpProcessor.java Constants.java

[mturk]

Author: mturk
Date: Sun Nov 26 01:29:15 2006
New Revision: 479317

URL: http://svn.apache.org/viewvc?view=rev&rev=479317
Log:
Compress outgoing response headers according to the
AJP13 protocol specification.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?view=diff&rev=479317&r1=479316&r2=479317
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sun 
Nov 26 01:29:15 2006
@@ -960,9 +960,15 @@
 // Other headers
 int numHeaders = headers.size();
 responseHeaderMessage.appendInt(numHeaders);
-for (int i = 0; i < numHeaders; i++) {
+for (int i = 0; i < numHeaders; i++) {
 MessageBytes hN = headers.getName(i);
-responseHeaderMessage.appendBytes(hN);
+int hC = Constants.getResponseAjpIndex(hN.toString());
+if (hC > 0) {
+responseHeaderMessage.appendInt(hC);
+}
+else {
+responseHeaderMessage.appendBytes(hN);
+}
 MessageBytes hV=headers.getValue(i);
 responseHeaderMessage.appendBytes(hV);
 }

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?view=diff&rev=479317&r1=479316&r2=479317
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sun Nov 
26 01:29:15 2006
@@ -929,7 +929,13 @@
 responseHeaderMessage.appendInt(numHeaders);
 for (int i = 0; i < numHeaders; i++) {
 MessageBytes hN = headers.getName(i);
-responseHeaderMessage.appendBytes(hN);
+int hC = Constants.getResponseAjpIndex(hN.toString());
+if (hC > 0) {
+responseHeaderMessage.appendInt(hC);
+}
+else {
+responseHeaderMessage.appendBytes(hN);
+}
 MessageBytes hV=headers.getValue(i);
 responseHeaderMessage.appendBytes(hV);
 }

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java?view=diff&rev=479317&r1=479316&r2=479317
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java Sun Nov 26 
01:29:15 2006
@@ -17,6 +17,9 @@
 
 package org.apache.coyote.ajp;
 
+import java.lang.IndexOutOfBoundsException;
+import java.util.Hashtable;
+import java.util.Locale;
 import org.apache.tomcat.util.buf.ByteChunk;
 
 
@@ -67,6 +70,7 @@
 public static final int SC_RESP_SERVLET_ENGINE  = 0xA009;
 public static final int SC_RESP_STATUS  = 0xA00A;
 public static final int SC_RESP_WWW_AUTHENTICATE= 0xA00B;
+public static final int SC_RESP_AJP13_MAX   = 11;
 
 // Integer codes for common (optional) request attribute names
 public static final byte SC_A_CONTEXT   = 1;  // XXX Unused
@@ -179,7 +183,47 @@
 "user-agent"
 };
 
+// Translates integer codes to response header names
+public static final String []responseTransArray = {
+"content-type",
+"content-language",
+"content-length",
+"date",
+"last-modified",
+"location",
+"set-cookie",
+"set-cookie2",
+"servlet-engine",
+"status",
+"www-authenticate"
+};
+
+private static final Hashtable  responseTransHash =
+new Hashtable(20);
+
+static {
+try {
+int i;
+for (i = 0; i < SC_RESP_AJP13_MAX; i++) {
+responseTransHash.put(responseTransArray[i],
+  new Integer(0xA001 + i));
+}
+}
+catch (Exception e) {
+// Do nothing
+}
+}
+
+public static final int getResponseAjpIndex(String header)
+{
+Integer i = responseTransHash.get(header.toLowerCase(Locale.US));
+if (i == null)
+return 0;
+else
+return i.intValue();
+}
 
+
 /**
  * CRLF.
  

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

[rjung]

Author: rjung
Date: Sun Nov 26 01:17:17 2006
New Revision: 479316

URL: http://svn.apache.org/viewvc?view=rev&rev=479316
Log:
The big status worker update:
1) Added  our standard TRACE messages
2) Added a couple of debug, info and warn log messages
3) Added constants for attribute names and values
4) Added Some constants for attribute clear text names
5) Make xml and txt mime type functional for list,
   show, update and reset.
6) Implement the new read_only feature, that disabled
   edit/update/reset. You can have e.g. two status worker
   mapped to different URLs, one of them read/write (default)
   and the other read only.
7) Implement the new "user" attribute. It is a list of users
   the Status worker checks against the remote_user field.
   The authentication process itself has do be done by the web
   server. Empty list = access to unauthenticated users.
8) Additional lb overview fields: good/degraded/bad
   - bad = in error or in recovering or stopped
   - degraded = not bad but disabled or busy
   - good = neither bad nor degraded (active and OK or N/A)
9) global lb edit per attribute: additional edit view
   for lb, where one can add one attribute for all members on
   a common page, e.g. the activation or the lb factor etc.
10) Some new utility functions (e.g. to write a self referring uri)
11) Quite some refactoring.

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


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

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

[rjung]

Author: rjung
Date: Sun Nov 26 01:40:50 2006
New Revision: 479318

URL: http://svn.apache.org/viewvc?view=rev&rev=479318
Log:
Adding read_only and user as status worker attributes to the docs.
Update for the changelog, all items concerning the status worker.

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

Modified: tomcat/connectors/trunk/jk/xdocs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/changelog.xml?view=diff&rev=479318&r1=479317&r2=479318
==
--- tomcat/connectors/trunk/jk/xdocs/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/changelog.xml Sun Nov 26 01:40:50 2006
@@ -26,6 +26,34 @@
   
   
 
+  
+  Status Worker: All functions accessible also for xml and txt
+  mime types (list, show, update, reset). (rjung)
+  
+  
+  Status Worker: New global health indicators for load balancers
+  named bad (error, recovering or stopped), degraded (busy or disabled)
+  and good (the rest, active and OK or N/A). (rjung)
+  
+  
+  Status Worker: New edit page, to change one attribute for all
+  members of a load balancer. (rjung)
+  
+  
+  Status Worker: Standard logging for status worker. (rjung)
+  
+  
+  Status Worker: code refactoring. (rjung)
+  
+  
+  Status Worker: New attribute user (list) denies access, if
+  the request user in the sense of remote_user is not in this list.
+  Empty list = no deny (rjung)
+  
+  
+  Status Worker: New attribute read_only disables the parts
+  of the status worker, that change states and configurations. (rjung)
+  
   
 36121: Don't change main uri when mod_jk serves
 included uri. (markt)

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=479318&r1=479317&r2=479318
==
--- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/workers.xml Sun Nov 26 01:40:50 2006
@@ -372,6 +372,17 @@
 
 Specifies the url for cascading stylesheet to use.
 
+
+A status worker with read_only=True will not allow any operations,
+that change the runtime state or configuration of the other workers.
+These are edit/update/reset.
+
+
+This directive can be used mutltiple times. 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.
+
 
 
 



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

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

[Mladen Turk]

[EMAIL PROTECTED] wrote:

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=479316&r1=479315&r2=479316
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 01:17:17 
2006
@@ -38,6 +38,82 @@



There are few compile time warnings:

jk_status.c
\jk\native\common\jk_status.c(1914) : warning C4101: 'i' : unreferenced local 
variable
\jk\native\common\jk_status.c(1947) : warning C4101: 'i' : unreferenced local 
variable
\jk\native\common\jk_status.c(1978) : warning C4101: 'i' : unreferenced local 
variable
\jk\native\common\jk_status.c(2275) : warning C4018: '<' : signed/unsigned 
mismatch
\jk\native\common\jk_status.c(2618) : warning C4018: '<' : signed/unsigned 
mismatch


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

svn commit: r479321 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[mturk]

Author: mturk
Date: Sun Nov 26 01:50:34 2006
New Revision: 479321

URL: http://svn.apache.org/viewvc?view=rev&rev=479321
Log:
Add simpler name for jvmRoute. Right now we use
jvm_rute. Allow having just route to be consistent
with domain and redirect params.

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

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=479321&r1=479320&r2=479321
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Nov 26 01:50:34 2006
@@ -66,6 +66,7 @@
 #define STICKY_SESSION  ("sticky_session")
 #define STICKY_SESSION_FORCE("sticky_session_force")
 #define JVM_ROUTE_OF_WORKER ("jvm_route")
+#define ROUTE_OF_WORKER ("route")
 #define DOMAIN_OF_WORKER("domain")
 #define REDIRECT_OF_WORKER  ("redirect")
 #define MOUNT_OF_WORKER ("mount")
@@ -152,6 +153,7 @@
 STICKY_SESSION,
 STICKY_SESSION_FORCE,
 JVM_ROUTE_OF_WORKER,
+ROUTE_OF_WORKER,
 DOMAIN_OF_WORKER,
 REDIRECT_OF_WORKER,
 METHOD_OF_WORKER,
@@ -481,12 +483,18 @@
 
 const char *jk_get_worker_jvm_route(jk_map_t *m, const char *wname, const char 
*def)
 {
+const char *rv;
 char buf[1024];
 if (!m || !wname) {
 return NULL;
 }
-MAKE_WORKER_PARAM(JVM_ROUTE_OF_WORKER);
-return jk_map_get_string(m, buf, def);
+MAKE_WORKER_PARAM(ROUTE_OF_WORKER);
+rv = jk_map_get_string(m, buf, def);
+if (!rv) {
+MAKE_WORKER_PARAM(JVM_ROUTE_OF_WORKER);
+rv = jk_map_get_string(m, buf, def);
+}
+return rv;
 }
 
 const char *jk_get_worker_domain(jk_map_t *m, const char *wname, const char 
*def)



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

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

[Rainer Jung]

I'll fix.

Mladen Turk schrieb:
> [EMAIL PROTECTED] wrote:
>> 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=479316&r1=479315&r2=479316
>>
>> ==
>>
>> --- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
>> +++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26
>> 01:17:17 2006
>> @@ -38,6 +38,82 @@
>>
> 
> There are few compile time warnings:
> 
> jk_status.c
> \jk\native\common\jk_status.c(1914) : warning C4101: 'i' : unreferenced
> local variable
> \jk\native\common\jk_status.c(1947) : warning C4101: 'i' : unreferenced
> local variable
> \jk\native\common\jk_status.c(1978) : warning C4101: 'i' : unreferenced
> local variable
> \jk\native\common\jk_status.c(2275) : warning C4018: '<' :
> signed/unsigned mismatch
> \jk\native\common\jk_status.c(2618) : warning C4018: '<' :
> signed/unsigned mismatch
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]

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

Re: svn commit: r479321 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[Rainer Jung]

Hi Mladen,

since this has already been out in the wild for a few month, I'd prefer
to add the old one to the deprecation list in jk_util.c and in the docs
and to have the get function fall back to the original one, if the new
attribute is empty (like for disable/stop -> activation).

Regards,

Rainer

[EMAIL PROTECTED] schrieb:
> Author: mturk
> Date: Sun Nov 26 01:50:34 2006
> New Revision: 479321
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=479321
> Log:
> Add simpler name for jvmRoute. Right now we use
> jvm_rute. Allow having just route to be consistent
> with domain and redirect params.
> 
> Modified:
> tomcat/connectors/trunk/jk/native/common/jk_util.c
> 
> 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=479321&r1=479320&r2=479321
> ==
> --- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
> +++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Nov 26 01:50:34 
> 2006
> @@ -66,6 +66,7 @@
>  #define STICKY_SESSION  ("sticky_session")
>  #define STICKY_SESSION_FORCE("sticky_session_force")
>  #define JVM_ROUTE_OF_WORKER ("jvm_route")
> +#define ROUTE_OF_WORKER ("route")
>  #define DOMAIN_OF_WORKER("domain")
>  #define REDIRECT_OF_WORKER  ("redirect")
>  #define MOUNT_OF_WORKER ("mount")
> @@ -152,6 +153,7 @@
>  STICKY_SESSION,
>  STICKY_SESSION_FORCE,
>  JVM_ROUTE_OF_WORKER,
> +ROUTE_OF_WORKER,
>  DOMAIN_OF_WORKER,
>  REDIRECT_OF_WORKER,
>  METHOD_OF_WORKER,
> @@ -481,12 +483,18 @@
>  
>  const char *jk_get_worker_jvm_route(jk_map_t *m, const char *wname, const 
> char *def)
>  {
> +const char *rv;
>  char buf[1024];
>  if (!m || !wname) {
>  return NULL;
>  }
> -MAKE_WORKER_PARAM(JVM_ROUTE_OF_WORKER);
> -return jk_map_get_string(m, buf, def);
> +MAKE_WORKER_PARAM(ROUTE_OF_WORKER);
> +rv = jk_map_get_string(m, buf, def);
> +if (!rv) {
> +MAKE_WORKER_PARAM(JVM_ROUTE_OF_WORKER);
> +rv = jk_map_get_string(m, buf, def);
> +}
> +return rv;
>  }
>  
>  const char *jk_get_worker_domain(jk_map_t *m, const char *wname, const char 
> *def)
> 
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]

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

svn commit: r479324 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[mturk]

Author: mturk
Date: Sun Nov 26 02:01:09 2006
New Revision: 479324

URL: http://svn.apache.org/viewvc?view=rev&rev=479324
Log:
Revert second name for jvm_route.
We'll either deprecate jvm_route and use route instead,
or keep the existing directive.

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

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=479324&r1=479323&r2=479324
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Nov 26 02:01:09 2006
@@ -66,7 +66,6 @@
 #define STICKY_SESSION  ("sticky_session")
 #define STICKY_SESSION_FORCE("sticky_session_force")
 #define JVM_ROUTE_OF_WORKER ("jvm_route")
-#define ROUTE_OF_WORKER ("route")
 #define DOMAIN_OF_WORKER("domain")
 #define REDIRECT_OF_WORKER  ("redirect")
 #define MOUNT_OF_WORKER ("mount")
@@ -153,7 +152,6 @@
 STICKY_SESSION,
 STICKY_SESSION_FORCE,
 JVM_ROUTE_OF_WORKER,
-ROUTE_OF_WORKER,
 DOMAIN_OF_WORKER,
 REDIRECT_OF_WORKER,
 METHOD_OF_WORKER,
@@ -483,18 +481,12 @@
 
 const char *jk_get_worker_jvm_route(jk_map_t *m, const char *wname, const char 
*def)
 {
-const char *rv;
 char buf[1024];
 if (!m || !wname) {
 return NULL;
 }
-MAKE_WORKER_PARAM(ROUTE_OF_WORKER);
-rv = jk_map_get_string(m, buf, def);
-if (!rv) {
-MAKE_WORKER_PARAM(JVM_ROUTE_OF_WORKER);
-rv = jk_map_get_string(m, buf, def);
-}
-return rv;
+MAKE_WORKER_PARAM(JVM_ROUTE_OF_WORKER);
+return jk_map_get_string(m, buf, def);
 }
 
 const char *jk_get_worker_domain(jk_map_t *m, const char *wname, const char 
*def)



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

svn commit: r479325 - /tomcat/connectors/trunk/jk/xdocs/config/workers.xml

[mturk]

Author: mturk
Date: Sun Nov 26 02:02:44 2006
New Revision: 479325

URL: http://svn.apache.org/viewvc?view=rev&rev=479325
Log:
Document auto setting domain from jvm_route.

Modified:
tomcat/connectors/trunk/jk/xdocs/config/workers.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=479325&r1=479324&r2=479325
==
--- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/workers.xml Sun Nov 26 02:02:44 2006
@@ -535,7 +535,7 @@
 
 
 
-
+
 Normally the name of a balanced worker in a load balancer is equal to the 
jvmRoute
 of the corresponding Tomcat instance. If you want to include a worker 
corresponding
 to a Tomcat instance into several load balancers with different balancing 
configuration
@@ -549,6 +549,10 @@
 
 
 This attribute can be changed at runtime using status worker.
+
+
+If the route name contains a period, the part before the first period will be
+used as domain name, unless domain is set explicitly.
 
 
 This feature has been added in jk 1.2.16.



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

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

[rjung]

Author: rjung
Date: Sun Nov 26 02:05:38 2006
New Revision: 479327

URL: http://svn.apache.org/viewvc?view=rev&rev=479327
Log:
Fix a couple of compile time warnings
(unused vars and int/unsigned int conversion)

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=479327&r1=479326&r2=479327
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 02:05:38 
2006
@@ -1911,7 +1911,6 @@
const char *worker, const char *sub_worker,
int refresh, jk_logger_t *l)
 {
-unsigned int i;
 jk_worker_t *w = NULL;
 
 JK_TRACE_ENTER(l);
@@ -1944,7 +1943,6 @@
const char *worker, const char *sub_worker,
jk_logger_t *l)
 {
-unsigned int i;
 jk_worker_t *w = NULL;
 
 JK_TRACE_ENTER(l);
@@ -1975,7 +1973,6 @@
const char *worker, const char *sub_worker,
jk_logger_t *l)
 {
-unsigned int i;
 jk_worker_t *w = NULL;
 
 JK_TRACE_ENTER(l);
@@ -2270,7 +2267,7 @@
 
 if (w->num_of_users) {
 if (s->remote_user) {
-unsigned int i;
+int i;
 denied = 1;
 for (i = 0; i < w->num_of_users; i++) {
 if (!strcmp(s->remote_user, w->user_names[i])) {
@@ -2602,7 +2599,7 @@
 JK_TRACE_ENTER(log);
 if (pThis && pThis->worker_private) {
 status_worker_t *p = pThis->worker_private;
-unsigned int i;
+int i;
 p->we = we;
 p->css = jk_get_worker_style_sheet(props, p->name, NULL);
 p->read_only = jk_get_is_read_only(props, p->name);



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

Re: svn commit: r479321 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

[Mladen Turk]

Rainer Jung wrote:


since this has already been out in the wild for a few month,


You are right. I've reverted the commit. I thought it was
introduced more recently. The name should be fine, although
it is a little bit strange (route or jvmroute would fit
better thought)

Regards,
Mladen.

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

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

[rjung]

Author: rjung
Date: Sun Nov 26 02:15:13 2006
New Revision: 479328

URL: http://svn.apache.org/viewvc?view=rev&rev=479328
Log:
Another compiler, another warning.
Fixed it.

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=479328&r1=479327&r2=479328
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 02:15:13 
2006
@@ -379,7 +379,7 @@
 {
 if (status_get_arg_raw(param, req, buf, len)) {
 char *off = buf;
-while (off=strpbrk(off, JK_STATUS_ESC_CHARS))
+while ((off = strpbrk(off, JK_STATUS_ESC_CHARS)))
 off[0] = '@';
 return buf;
 }
@@ -1373,7 +1373,6 @@
 
 for (i = 0; i < lb->num_of_workers; i++) {
 worker_record_t *wr = &(lb->lb_workers[i]);
-ajp_worker_t *a = (ajp_worker_t *)wr->w->worker_private;
 
 jk_putv(s, "", wr->s->name, "\n", NULL);
 



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

Re: svn commit: r479317 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpProcessor.java Constants.java

[Remy Maucherat]

[EMAIL PROTECTED] wrote:

+Integer i = responseTransHash.get(header.toLowerCase(Locale.US));


-0. The String operations take away any benefit this could have.

Rémy

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

Re: svn commit: r479317 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpProcessor.java Constants.java

[Mladen Turk]

Remy Maucherat wrote:

[EMAIL PROTECTED] wrote:
+Integer i = 
responseTransHash.get(header.toLowerCase(Locale.US));


-0. The String operations take away any benefit this could have.



Perhaps for CPU usage on the Tomcat, that is annihilated by the
lower processing on the mod_jk side. Also the network traffic is much lower.
The standard header having Content-Type, Content-Length and Date
is 30 bytes smaller.

If we can guarantee header names will always be in the proper
case, the toLowerCase can be omitted, or by using something
other to compare with array of string.

Regards,
Mladen.

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

Re: svn commit: r479317 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpProcessor.java Constants.java

[Remy Maucherat]

Mladen Turk wrote:

Remy Maucherat wrote:

[EMAIL PROTECTED] wrote:
+Integer i = 
responseTransHash.get(header.toLowerCase(Locale.US));


-0. The String operations take away any benefit this could have.



Perhaps for CPU usage on the Tomcat, that is annihilated by the
lower processing on the mod_jk side.


It seems the CPU is more important on the application server side. 
Obviously, one garbage string is not very important, but I did bother 
optimizing the rest, so I appreciate when others try to do the same 
thing too.


Also the network traffic is much 
lower.


I don't see how there can be a bandwidth issue between the front end 
server and the appserver.



The standard header having Content-Type, Content-Length and Date
is 30 bytes smaller.


Silly me who thought the actually relevant bandwidth was between the 
front end and the client ;)



If we can guarantee header names will always be in the proper
case, the toLowerCase can be omitted, or by using something
other to compare with array of string.


It's up to you if you want to add this feature. At the moment, I think I 
have to be against this change because the implementation is simply ugly.


Rémy

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

svn commit: r479344 - /tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java

[mturk]

Author: mturk
Date: Sun Nov 26 03:16:06 2006
New Revision: 479344

URL: http://svn.apache.org/viewvc?view=rev&rev=479344
Log:
The header set by Tomcat are always in proper case.
Skip creating additional lowercase String when getting AJP response index. 

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java?view=diff&rev=479344&r1=479343&r2=479344
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java Sun Nov 26 
03:16:06 2006
@@ -185,17 +185,17 @@
 
 // Translates integer codes to response header names
 public static final String []responseTransArray = {
-"content-type",
-"content-language",
-"content-length",
-"date",
-"last-modified",
-"location",
-"set-cookie",
-"set-cookie2",
-"servlet-engine",
-"status",
-"www-authenticate"
+"Content-Type",
+"Content-Language",
+"Content-Length",
+"Date",
+"Last-Modified",
+"Location",
+"Set-Cookie",
+"Set-Cookie2",
+"Servlet-Engine",
+"Status",
+"WWW-Authenticate"
 };
 
 private static final Hashtable  responseTransHash =
@@ -216,7 +216,7 @@
 
 public static final int getResponseAjpIndex(String header)
 {
-Integer i = responseTransHash.get(header.toLowerCase(Locale.US));
+Integer i = responseTransHash.get(header);
 if (i == null)
 return 0;
 else



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

Re: StandardManager behaviour when webapp stopped

[Mark Thomas]

Remy/Filip,

Thanks for your input. I'll update the bug report with a brief summary
and come back to this later.

Mark

Filip Hanik - Dev Lists wrote:
> You can still cluster just using AOP without ever involving the manager,
> hence such solutions would be affected by this new behavior.
> at most, when a webapp is shutdown, you can call passivate, but not
> invalidate the sessions.
> Filip
> 
> Remy Maucherat wrote:
>> Filip Hanik - Dev Lists wrote:
>>> it will cause problems for clustered stuff, not sure that container
>>> shutdown means session invalidation.
>>> for example, if you invalidate the session, such a change would
>>> trickle through the cluster, and that might not be intentional.
>>> I suggest we leave the behavior as is, or at least configurable if we
>>> mean to change it
>>
>> The clustered manager most likely would have the opportunity to
>> override the code which would do the expiration, I think.
>>
>> Rémy
>>
>> -
>> To unsubscribe, e-mail: [EMAIL PROTECTED]
>> For additional commands, e-mail: [EMAIL PROTECTED]
>>
>>
>>
> 
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
> 
> 


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

DO NOT REPLY [Bug 40593] - HttpSessionListener#sessionDestroyed is not called though the manager's pathname is emply.

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





--- Additional Comments From [EMAIL PROTECTED]  2006-11-26 07:22 ---
The conclusion from the discussion on the dev list was:
- this change would be acceptable
- it must be configurable
- the default behaviour must be the current behaviour

I'll come back to this later. In the meantime, you can always implement your own
Manager that extends StandardManager and overrides doUnload(). If you need help
to do this, please ask on 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]

svn commit: r479370 - in /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session: ManagerBase.java PersistentManagerBase.java StandardManager.java

[markt]

Author: markt
Date: Sun Nov 26 07:31:29 2006
New Revision: 479370

URL: http://svn.apache.org/viewvc?view=rev&rev=479370
Log:
Code clean-up. Remove unused code from o.a.c.session

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/ManagerBase.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/ManagerBase.java?view=diff&rev=479370&r1=479369&r2=479370
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/ManagerBase.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/ManagerBase.java
 Sun Nov 26 07:31:29 2006
@@ -701,7 +701,6 @@
 if( oname==null ) {
 try {
 StandardContext ctx=(StandardContext)this.getContainer();
-Engine eng=(Engine)ctx.getParent().getParent();
 domain=ctx.getEngineName();
 distributable = ctx.getDistributable();
 StandardHost hst=(StandardHost)ctx.getParent();

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java?view=diff&rev=479370&r1=479369&r2=479370
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
 Sun Nov 26 07:31:29 2006
@@ -921,7 +921,7 @@
 // Force initialization of the random number generator
 if (log.isDebugEnabled())
 log.debug("Force random number initialization starting");
-String dummy = generateSessionId();
+generateSessionId();
 if (log.isDebugEnabled())
 log.debug("Force random number initialization completed");
 
@@ -993,7 +993,6 @@
 // Validate the source of this event
 if (!(event.getSource() instanceof Context))
 return;
-Context context = (Context) event.getSource();
 
 // Process a relevant property change
 if (event.getPropertyName().equals("sessionTimeout")) {

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java?view=diff&rev=479370&r1=479369&r2=479370
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java
 Sun Nov 26 07:31:29 2006
@@ -628,7 +628,7 @@
 // Force initialization of the random number generator
 if (log.isDebugEnabled())
 log.debug("Force random number initialization starting");
-String dummy = generateSessionId();
+generateSessionId();
 if (log.isDebugEnabled())
 log.debug("Force random number initialization completed");
 
@@ -708,7 +708,6 @@
 // Validate the source of this event
 if (!(event.getSource() instanceof Context))
 return;
-Context context = (Context) event.getSource();
 
 // Process a relevant property change
 if (event.getPropertyName().equals("sessionTimeout")) {



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

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

[rjung]

Author: rjung
Date: Sun Nov 26 08:34:38 2006
New Revision: 479376

URL: http://svn.apache.org/viewvc?view=rev&rev=479376
Log:
Adding max_packet_size to docs.

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

Modified: tomcat/connectors/trunk/jk/xdocs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/changelog.xml?view=diff&rev=479376&r1=479375&r2=479376
==
--- tomcat/connectors/trunk/jk/xdocs/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/changelog.xml Sun Nov 26 08:34:38 2006
@@ -27,6 +27,10 @@
   
 
   
+  Docs: Added short description of max_packet_size to worker
+  reference. (rjung)
+  
+  
   Status Worker: All functions accessible also for xml and txt
   mime types (list, show, update, reset). (rjung)
   

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=479376&r1=479375&r2=479376
==
--- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/workers.xml Sun Nov 26 08:34:38 2006
@@ -376,12 +376,18 @@
 A status worker with read_only=True will not allow any operations,
 that change the runtime state or configuration of the other workers.
 These are edit/update/reset.
+
+This feature has been added in jk 1.2.20.
+
 
 
 This directive can be used mutltiple times. 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 feature has been added in jk 1.2.20.
+
 
 
 
@@ -443,6 +449,22 @@
 
 
 
+
+This attribute sets the maximal AJP packet size in Bytes.
+The maximum value is 65536. If you change it from the default,
+you must also change the packetSize attribute of your AJP
+connector on the tomcat side! The attribute packetSize is only available
+in Tomcat 5.5.20+ and 6.0.2+.
+
+Normally it is not necessary to change the maximum packet size. Problems
+with the default value have been reported when sending certificates or
+certificate chains.
+
+
+This feature has been added in jk 1.2.19.
+
+
+
 
 Only used for a member worker of a load balancer.
 
@@ -556,6 +578,7 @@
 
 
 This feature has been added in jk 1.2.16.
+The automatic domain rule has been added in jk 1.2.20.
 
 
 



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

svn commit: r479378 - in /tomcat/connectors/trunk/jk/xdocs: changelog.xml config/project.xml config/uriworkermap.xml project.xml

[rjung]

Author: rjung
Date: Sun Nov 26 08:36:47 2006
New Revision: 479378

URL: http://svn.apache.org/viewvc?view=rev&rev=479378
Log:
New doc page for uriworkermap.

Added:
tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml   (with props)
Modified:
tomcat/connectors/trunk/jk/xdocs/changelog.xml
tomcat/connectors/trunk/jk/xdocs/config/project.xml
tomcat/connectors/trunk/jk/xdocs/project.xml

Modified: tomcat/connectors/trunk/jk/xdocs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/changelog.xml?view=diff&rev=479378&r1=479377&r2=479378
==
--- tomcat/connectors/trunk/jk/xdocs/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/changelog.xml Sun Nov 26 08:36:47 2006
@@ -27,6 +27,9 @@
   
 
   
+  Docs: New page with description of uriworkermap. (rjung)
+  
+  
   Docs: Added short description of max_packet_size to worker
   reference. (rjung)
   

Modified: tomcat/connectors/trunk/jk/xdocs/config/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/project.xml?view=diff&rev=479378&r1=479377&r2=479378
==
--- tomcat/connectors/trunk/jk/xdocs/config/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/project.xml Sun Nov 26 08:36:47 2006
@@ -14,6 +14,7 @@
 
 
 
+
 
 
 

Added: tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml?view=auto&rev=479378
==
--- tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml (added)
+++ tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml Sun Nov 26 
08:36:47 2006
@@ -0,0 +1,247 @@
+
+
+]>
+
+
+&project;
+
+
+Rainer Jung
+uriworkermap.properties configuration
+
+
+
+
+
+
+
+The forwarding of requests from the web server to tomcat gets configured by 
defining mapping rules.
+Such a rule maps requests to workers. The request part of the map is described 
by a URI pattern,
+the worker by it's worker name.
+
+
+The so-called uriworkermap file is a mechanism of defining rules,
+which works for all web servers. There exist also other web server specific 
configuration
+options for defining rules, which will be mostly discussed on the reference 
pages for
+configuring tomcat connectors for the individual web servers.
+
+
+The name of the file is usually uriworkermap.properties,
+although this is configurable in the web server.
+Please consult the web server specific documentation pages on
+how to enable the uriworkermap file.
+
+
+The main features supported by the uriworkermap file are
+
+
+Exact and wildchar matches, shortcuts to map a directory and all including 
content.
+
+
+Exclusion rules, disabling of rules an defined preferences behaviour.
+
+
+Virtual host integration: uri mapping rules can be expressed per virtual host.
+The details are web server specific though.
+
+
+Dynamic reloading: The file gets checked every 60 seconds for changes.
+New versions are automatically reloaded without web server restarts.
+
+
+Integration with the status worker.
+
+
+Support for comments in the rule file.
+
+
+The following sections describe these aspects in more detail.
+
+
+
+
+
+
+
+
+The file has a line based format. There are no continuation characters,
+so each rule needs to be defined on a single line. Each rule is a pair 
consisting
+of a URI pattern and a worker name, combined by an equals sign '=':
+
+  /myapp=myworker
+
+The URI pattern is case sensitive.
+
+
+
+
+
+All text after and including the character '#' gets ignored and can be used 
for comments.
+Leading and trailing white space gets trimmed around the URI pattern and also 
around the worker name.
+The following definitions are all equivalent:
+
+  # This is a white space example
+  /myapp=myworker
+ /myapp=myworker
+  /myapp  =  myworker
+
+
+
+
+
+
+
+Inside the URI pattern three special characters can be used, '*', '?' and '|'.
+The character '*' is a wildchar that matches any number of arbitrary characters
+in the URI, '?' matches exactly one character.
+Each URI pattern has to start with the character '/', or with '*' or with '?',
+optionally prefixed by any combination of the modifiers '!' and '-' (see next 
section).
+
+  # Mapping the URI /myapp1 and everything under /myapp1/:
+  /myapp1=myworker-a
+  /myapp1/*=myworker-a
+  # Mapping all URI which end with a common suffix:
+  *.jsp=myworker
+  *.do=myworker
+
+Since the first case of mapping a certain location and everything inside
+it is very common, the character '|' gives a handy shortcut:
+
+  # Mapping the URI /myapp1 and everything under /myapp1/:
+  /myapp1|/*=myworker-a
+
+The pattern 'X|Y' is exactly equivalent to th

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

[mturk]

Author: mturk
Date: Sun Nov 26 10:42:41 2006
New Revision: 479400

URL: http://svn.apache.org/viewvc?view=rev&rev=479400
Log:
Make status worker XML constants user configurable.
Added ns, xmlns and doctype properties that user
can set to create custom xml.

Modified:
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

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=479400&r1=479399&r2=479400
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 10:42:41 
2006
@@ -121,10 +121,9 @@
 #define JK_STATUS_HEND "\n\n"
 #define JK_STATUS_BEND "\n\n"
 
-#define JK_STATUS_XMLH "\n" 
 \
-   "http://tomcat.apache.org\";>\n"
-
-#define JK_STATUS_XMLE "\n"
+#define JK_STATUS_XMLH "\n"
+#define JK_NSDEF   "jk:"
+#define JK_XMLNSDEF"xmlns:jk=\"http://tomcat.apache.org\"";
 
 typedef struct status_worker status_worker_t;
 
@@ -143,6 +142,9 @@
 jk_pool_atom_tbuf[TINY_POOL_SIZE];
 const char*name;
 const char*css;
+const char*ns;
+const char*xmlns;
+const char*doctype;
 int   read_only;
 char  **user_names;
 int   num_of_users;
@@ -599,6 +601,7 @@
 
 static void display_maps_xml(jk_ws_service_t *s,
  jk_uri_worker_map_t *uwmap,
+status_worker_t *sw,
  const char *worker, jk_logger_t *l)
 {
 char buf[64];
@@ -612,7 +615,7 @@
 continue;
 }
 count++;
-jk_printf(s, "  ns, "map\n", NULL);
 jk_printf(s, "type=\"%s\"\n", uri_worker_map_get_match(uwr, 
buf, l));
 jk_printf(s, "uri=\"%s\"\n", uwr->uri);
 jk_printf(s, "source=\"%s\"/>\n", 
uri_worker_map_get_source(uwr, l));
@@ -689,7 +692,7 @@
 if (single) {
 jk_puts(s, "\n");
 status_write_uri(s, "Back to full worker list", JK_STATUS_CMD_LIST,
- 0, 0, refresh, NULL, NULL); 
+ 0, 0, refresh, NULL, NULL);
 jk_puts(s, "\n");
 from = JK_STATUS_CMD_SHOW;
 }
@@ -712,14 +715,14 @@
 }
 else {
 status_write_uri(s, "S", JK_STATUS_CMD_SHOW,
- 0, 0, refresh, name, NULL); 
+ 0, 0, refresh, name, NULL);
 }
 jk_puts(s, "|");
 status_write_uri(s, "E", JK_STATUS_CMD_EDIT,
- 0, from, refresh, name, NULL); 
+ 0, from, refresh, name, NULL);
 jk_puts(s, "|");
 status_write_uri(s, "R", JK_STATUS_CMD_RESET,
- 0, from, refresh, name, NULL); 
+ 0, from, refresh, name, NULL);
 jk_puts(s, "]  ");
 jk_putv(s, "Worker Status for ", name, "\n", NULL);
 jk_putv(s, ""
@@ -763,24 +766,27 @@
 jk_printf(s, "%d", lb->s->busy);
 jk_printf(s, "%d", lb->s->max_busy);
 jk_puts(s, "\n\n\n");
-
+jk_puts(s, "Balancer Members\n");
 jk_putv(s, ""
-"NameType", JK_STATUS_ARG_LBM_TEXT_ROUTE,
-"HostAddr"
-
"ActStatDFMVAccErrCE"
-
"WrRdBusyMaxRRCdRs\n",
 NULL);
+" NameType"
+"HostAddr"
+"ActStatDFM"
+"VAccErrCE"
+"WrRdBusyMax",
+JK_STATUS_ARG_LBM_TEXT_ROUTE,
+"RRCdRs\n", NULL);
 for (j = 0; j < lb->num_of_workers; j++) {
 worker_record_t *wr = &(lb->lb_workers[j]);
 ajp_worker_t *a = (ajp_worker_t *)wr->w->worker_private;
 jk_puts(s, "\n[");
 status_write_uri(s, "E", JK_STATUS_CMD_EDIT,
- 0, from, refresh, name, wr->s->name); 
+ 0, from, refresh, name, wr->s->name);
 jk_puts(s, "|");
 status_write_uri(s, "R", JK_STATUS_CMD_RESET,
- 0, from, refresh, name, wr->s->name); 
-jk_putv(s, "] ", wr->s->name, "\n", NULL);
+ 0, from, refresh, name, wr->s->name);
+jk_puts(s, "] ");
+jk_putv(s, "", wr->s->name, "", NULL);
 jk_putv(s, "", status_worker_type(wr->w->type), "", NULL);
-jk_putv(s, "", wr->s->jvm_route, "", NULL);
 jk_printf(s, "%s:%d", a->host, a->port);
 jk_putv(s, "", jk_dump_hinfo(&a->worker_inet_addr, buf),
 "", NULL);
@@ -799,17 +805,18 @@
 jk_putv(s, "

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

[mturk]

Author: mturk
Date: Sun Nov 26 10:52:31 2006
New Revision: 479402

URL: http://svn.apache.org/viewvc?view=rev&rev=479402
Log:
Document new status worker directives.

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

Modified: tomcat/connectors/trunk/jk/xdocs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/changelog.xml?view=diff&rev=479402&r1=479401&r2=479402
==
--- tomcat/connectors/trunk/jk/xdocs/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/changelog.xml Sun Nov 26 10:52:31 2006
@@ -27,6 +27,10 @@
   
 
   
+  Status Worker: Add directives for customizing the XML
+  output (ns, xmlns, doctype). (mturk)
+  
+  
   Docs: New page with description of uriworkermap. (rjung)
   
   

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=479402&r1=479401&r2=479402
==
--- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/workers.xml Sun Nov 26 10:52:31 2006
@@ -389,6 +389,32 @@
 This feature has been added in jk 1.2.20.
 
 
+
+This directive can be used to customize the XML output from the
+status worker. If set to - no namespace will be used.
+
+This feature has been added in jk 1.2.20.
+
+
+
+This directive can be used to customize the XML output from the
+status worker. If set to - no xmlns will be used.
+
+Default value is set to xmlns:jk="http://tomcat.apache.org";
+
+
+This feature has been added in jk 1.2.20.
+
+
+
+This directive can be used to customize the XML output from the
+status worker. This value will be inserted to the output xml
+after the xml header.
+
+This feature has been added in jk 1.2.20.
+
+
+
 
 
 



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

svn commit: r479404 - /tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml

[mturk]

Author: mturk
Date: Sun Nov 26 11:04:41 2006
New Revision: 479404

URL: http://svn.apache.org/viewvc?view=rev&rev=479404
Log:
Explain IIS virtual host mapping.

Modified:
tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml

Modified: tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml?view=diff&rev=479404&r1=479403&r2=479404
==
--- tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml Sun Nov 26 
11:04:41 2006
@@ -8,6 +8,7 @@
 
 
 Rainer Jung
+Mladen Turk
 uriworkermap.properties configuration
 
 
@@ -180,9 +181,26 @@
 
 
 When using IIS you can restrict individual rules to special virtual hosts
-by prefixing the URI pattern with the virtual host information:
+by prefixing the URI pattern with the virtual host information.
+The rules is that the url must be prefixed with the host name.
 
-  # To be completed
+  # Use www.foo.org as virtual host
+  /www.foo.org/myapp/*=myworker
+  # Use www.bar.org as virtual host
+  /www.bar.org/myapp/*=myworker
+  # Normal mapping
+  /mysecondapp/*=myworker
+
+
+
+Note that /mysecondapp/* will be mapped to all virtual hosts present.
+In  case one needs to prevent the mappings to some particular virual host then
+the exclusion rule must be used
+
+  # Make sure the myapp is accessible by all virtual hosts
+  /myapp/*=myworker
+  # Disable mapping myapp for www.foo.org virtual host
+  !/www.foo.org/myapp/*=myworker
 
 
 



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

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

[mturk]

Author: mturk
Date: Sun Nov 26 11:27:57 2006
New Revision: 479407

URL: http://svn.apache.org/viewvc?view=rev&rev=479407
Log:
Fix status XML for ajp workers.

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=479407&r1=479406&r2=479407
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 11:27:57 
2006
@@ -19,7 +19,7 @@
  * Description: Status worker, display and manages JK workers  *
  * Author:  Mladen Turk <[EMAIL PROTECTED]>  *
  * Author:  Rainer Jung <[EMAIL PROTECTED]> *
- * Version: $Revision$   *
+ * Version: $Revision$*
  ***/
 
 #include "jk_pool.h"
@@ -959,7 +959,9 @@
 if (rs < lb->recover_wait_time - (int)difftime(now, 
wr->s->error_time))
 rs += lb->maintain_time;
 }
-jk_printf(s, "time-to-recover=\"%u\"/>\n", rs < 0 ? 0 : 
rs);
+jk_printf(s, "time-to-recover=\"%u\"", rs < 0 ? 0 : rs);
+/* Terminate the tag */
+jk_puts(s, "/>\n");
 }
 if (name)
 display_maps_xml(s, s->uw_map, sw, name, l);
@@ -971,7 +973,9 @@
 jk_printf(s, "  type=\"%s\"\n", status_worker_type(w->type));
 jk_printf(s, "  host=\"%s\"\n", aw->host);
 jk_printf(s, "  port=\"%d\"\n", aw->port);
-jk_printf(s, "  address=\"%s\"/>\n", 
jk_dump_hinfo(&aw->worker_inet_addr, buf));
+jk_printf(s, "  address=\"%s\"", jk_dump_hinfo(&aw->worker_inet_addr, 
buf));
+/* Terminate the tag */
+jk_puts(s, "/>\n");
 if (name)
 display_maps_xml(s, s->uw_map, sw, name, l);
 jk_putv(s, "ns, "ajp>\n", NULL);



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

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

[mturk]

Author: mturk
Date: Sun Nov 26 11:30:02 2006
New Revision: 479409

URL: http://svn.apache.org/viewvc?view=rev&rev=479409
Log:
Fix the Fix (remove extra slash).

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=479409&r1=479408&r2=479409
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 11:30:02 
2006
@@ -975,7 +975,7 @@
 jk_printf(s, "  port=\"%d\"\n", aw->port);
 jk_printf(s, "  address=\"%s\"", jk_dump_hinfo(&aw->worker_inet_addr, 
buf));
 /* Terminate the tag */
-jk_puts(s, "/>\n");
+jk_puts(s, ">\n");
 if (name)
 display_maps_xml(s, s->uw_map, sw, name, l);
 jk_putv(s, "ns, "ajp>\n", NULL);



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

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

[mturk]

Author: mturk
Date: Sun Nov 26 12:06:55 2006
New Revision: 479417

URL: http://svn.apache.org/viewvc?view=rev&rev=479417
Log:
Unify mime=txt for status worker.
Each line begins with 'Tag:'. Also, no need for
quotation of param values because they cannot contain
spaces which is used as separator.

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=479417&r1=479416&r2=479417
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 12:06:55 
2006
@@ -642,10 +642,10 @@
 continue;
 }
 count++;
-jk_printf(s, "  JK Map:");
-jk_printf(s, " type=\"%s\"", uri_worker_map_get_match(uwr, buf, l));
-jk_printf(s, " uri=\"%s\"", uwr->uri);
-jk_printf(s, " source=\"%s\"\n", uri_worker_map_get_source(uwr, l));
+jk_printf(s, "Map:");
+jk_printf(s, " type=%s", uri_worker_map_get_match(uwr, buf, l));
+jk_printf(s, " uri=%s", uwr->uri);
+jk_printf(s, " source=%s\n", uri_worker_map_get_source(uwr, l));
 }
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
@@ -1043,68 +1043,66 @@
good++;
 }
 
-jk_printf(s, "  Balancer:");
-jk_printf(s, " name=\"%s\"", name);
-jk_printf(s, " type=\"%s\"", status_worker_type(w->type));
-jk_printf(s, " sticky=\"%s\"", status_val_bool(lb->sticky_session));
-jk_printf(s, " stickyforce=\"%s\"", 
status_val_bool(lb->sticky_session_force));
-jk_printf(s, " retries=\"%d\"", lb->retries);
-jk_printf(s, " recover=\"%d\"", lb->recover_wait_time);
-jk_printf(s, " method=\"%s\"", jk_lb_get_method(lb, l));
-jk_printf(s, " lock=\"%s\"", jk_lb_get_lock(lb, l));
-jk_printf(s, " good=\"%d\"", good);
-jk_printf(s, " degraded=\"%d\"", degraded);
-jk_printf(s, " bad=\"%d\"", bad);
-jk_printf(s, " busy=\"%d\"", lb->s->busy);
-jk_printf(s, " max_busy=\"%d\"\n", lb->s->max_busy);
+jk_printf(s, "Balancer:");
+jk_printf(s, " name=%s", name);
+jk_printf(s, " type=%s", status_worker_type(w->type));
+jk_printf(s, " sticky=%s", status_val_bool(lb->sticky_session));
+jk_printf(s, " stickyforce=%s", 
status_val_bool(lb->sticky_session_force));
+jk_printf(s, " retries=%d", lb->retries);
+jk_printf(s, " recover=%d", lb->recover_wait_time);
+jk_printf(s, " method=%s", jk_lb_get_method(lb, l));
+jk_printf(s, " lock=%s", jk_lb_get_lock(lb, l));
+jk_printf(s, " good=%d", good);
+jk_printf(s, " degraded=%d", degraded);
+jk_printf(s, " bad=%d", bad);
+jk_printf(s, " busy=%d", lb->s->busy);
+jk_printf(s, " max_busy=%d\n", lb->s->max_busy);
 
 for (j = 0; j < lb->num_of_workers; j++) {
 worker_record_t *wr = &(lb->lb_workers[j]);
 ajp_worker_t *a = (ajp_worker_t *)wr->w->worker_private;
 int rs = 0;
 /* TODO: descriptive status */
-jk_printf(s, "  Member");
-jk_printf(s, " name=\"%s\"", wr->s->name);
-jk_printf(s, " type=\"%s\"", status_worker_type(wr->w->type));
-jk_printf(s, " host=\"%s\"", a->host);
-jk_printf(s, " port=\"%d\"", a->port);
-jk_printf(s, " address=\"%s\"", 
jk_dump_hinfo(&a->worker_inet_addr, buf));
-jk_printf(s, " activation=\"%s\"", jk_lb_get_activation(wr, l));
-jk_printf(s, " lbfactor=\"%d\"", wr->s->lb_factor);
-jk_printf(s, " jvm_route=\"%s\"", wr->s->jvm_route ? 
wr->s->jvm_route : "");
-jk_printf(s, " redirect=\"%s\"", wr->s->redirect ? wr->s->redirect 
: "");
-jk_printf(s, " domain=\"%s\"", wr->s->domain ? wr->s->domain : "");
-jk_printf(s, " distance=\"%d\"", wr->s->distance);
-jk_printf(s, " state=\"%s\"", jk_lb_get_state(wr, l));
-jk_printf(s, " lbmult=\"%" JK_UINT64_T_FMT "\"", wr->s->lb_mult);
-jk_printf(s, " lbvalue=\"%" JK_UINT64_T_FMT "\"", wr->s->lb_value);
-jk_printf(s, " elected=\"%" JK_UINT64_T_FMT "\"", wr->s->elected);
-jk_printf(s, " errors=\"%" JK_UINT32_T_FMT "\"", wr->s->errors);
-jk_printf(s, " clienterrors=\"%" JK_UINT32_T_FMT "\"", 
wr->s->client_errors);
-jk_printf(s, " transferred=\"%" JK_UINT64_T_FMT "\"", 
wr->s->transferred);
-jk_printf(s, " readed=\"%" JK_UINT64_T_FMT "\"", wr->s->readed);
-jk_printf(s, " busy=\"%u\"", wr->s->busy);
-jk_printf(s, " maxbusy=\"%u\"", wr->s->max_busy);
+jk_printf(s, "Member:");
+jk_printf(s, " name=%s", wr->s->name);
+

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

[mturk]

Author: mturk
Date: Sun Nov 26 12:16:25 2006
New Revision: 479419

URL: http://svn.apache.org/viewvc?view=rev&rev=479419
Log:
Add size param to 'Load Balancers:' and 'Maps:' tags.

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=479419&r1=479418&r2=479419
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 12:16:25 
2006
@@ -642,7 +642,16 @@
 continue;
 }
 count++;
-jk_printf(s, "Map:");
+}
+if (count) {
+jk_printf(s, "Maps: size=%d\n", count);
+}
+for (i = 0; i < uwmap->size; i++) {
+uri_worker_record_t *uwr = uwmap->maps[i];
+if (!worker || strcmp(uwr->worker_name, worker)) {
+continue;
+}
+jk_puts(s, "Map:");
 jk_printf(s, " type=%s", uri_worker_map_get_match(uwr, buf, l));
 jk_printf(s, " uri=%s", uwr->uri);
 jk_printf(s, " source=%s\n", uri_worker_map_get_source(uwr, l));
@@ -1892,9 +1901,21 @@
 continue;
 }
 if (w->type == JK_LB_WORKER_TYPE) {
-if (!has_lb)
-jk_puts(s, "Load Balancers:\n");
-has_lb = 1;
+has_lb++;
+}
+}
+if (has_lb)
+jk_printf(s, "Load Balancers: size=%d\n", has_lb);
+
+for (i = 0; i < sw->we->num_of_workers; i++) {
+w = wc_get_worker_for_name(sw->we->worker_list[i], l);
+if (!w) {
+jk_log(l, JK_LOG_WARNING,
+   "could not find worker '%s'",
+   sw->we->worker_list[i]);
+continue;
+}
+if (w->type == JK_LB_WORKER_TYPE) {
 display_worker_txt(s, w, 0, l);
 }
 }



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

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

[mturk]

Author: mturk
Date: Sun Nov 26 12:26:52 2006
New Revision: 479422

URL: http://svn.apache.org/viewvc?view=rev&rev=479422
Log:
Make Server: and Jk: tags like other.
Perhaps we could simply make mime=txt to look
like Java properties file?

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=479422&r1=479421&r2=479422
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 12:26:52 
2006
@@ -1905,7 +1905,7 @@
 }
 }
 if (has_lb)
-jk_printf(s, "Load Balancers: size=%d\n", has_lb);
+jk_printf(s, "Balancers: size=%d\n", has_lb);
 
 for (i = 0; i < sw->we->num_of_workers; i++) {
 w = wc_get_worker_for_name(sw->we->worker_list[i], l);
@@ -2450,13 +2450,12 @@
   JK_VERMAJOR, JK_VERMINOR, JK_VERFIX);
 jk_printf(s, "# TOMCAT_CONNECTOR_STR_%s\n",
   JK_EXPOSED_VERSION);
-jk_puts(s, "Server Name: ");
+jk_puts(s, "Server: name=");
 jk_puts(s, s->server_name);
-jk_printf(s, "\nServer Port: %d", s->server_port);
-jk_puts(s, "\n");
-jk_putv(s, "Server Version: ",
-s->server_software, "\n", NULL);
-jk_putv(s, "JK Version: ",
+jk_printf(s, " port=%d", s->server_port);
+jk_putv(s, " version=\"",
+s->server_software, "\"\n", NULL);
+jk_putv(s, "Jk: version=",
 JK_VERSTRING, "\n", NULL);
 if (cmd == JK_STATUS_CMD_LIST) {
 /* Step 2: Display configuration */



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

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

[mturk]

Author: mturk
Date: Sun Nov 26 12:37:32 2006
New Revision: 479424

URL: http://svn.apache.org/viewvc?view=rev&rev=479424
Log:
Add members size for balancer and non lb workers count.

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=479424&r1=479423&r2=479424
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 12:37:32 
2006
@@ -1065,7 +1065,8 @@
 jk_printf(s, " degraded=%d", degraded);
 jk_printf(s, " bad=%d", bad);
 jk_printf(s, " busy=%d", lb->s->busy);
-jk_printf(s, " max_busy=%d\n", lb->s->max_busy);
+jk_printf(s, " max_busy=%d", lb->s->max_busy);
+jk_printf(s, " members=%d\n", lb->num_of_workers);
 
 for (j = 0; j < lb->num_of_workers; j++) {
 worker_record_t *wr = &(lb->lb_workers[j]);
@@ -1888,7 +1889,8 @@
 jk_logger_t *l)
 {
 unsigned int i;
-int has_lb = 0;
+int lb_cnt = 0;
+int ajp_cnt = 0;
 jk_worker_t *w = NULL;
 
 JK_TRACE_ENTER(l);
@@ -1901,11 +1903,15 @@
 continue;
 }
 if (w->type == JK_LB_WORKER_TYPE) {
-has_lb++;
+lb_cnt++;
+}
+else if (w->type == JK_AJP13_WORKER_TYPE ||
+ w->type == JK_AJP14_WORKER_TYPE) {
+ajp_cnt++;
 }
 }
-if (has_lb)
-jk_printf(s, "Balancers: size=%d\n", has_lb);
+if (lb_cnt)
+jk_printf(s, "Balancers: size=%d\n", lb_cnt);
 
 for (i = 0; i < sw->we->num_of_workers; i++) {
 w = wc_get_worker_for_name(sw->we->worker_list[i], l);
@@ -1919,6 +1925,8 @@
 display_worker_txt(s, w, 0, l);
 }
 }
+if (ajp_cnt)
+jk_printf(s, "Workers: size=%d\n", ajp_cnt);
 
 for (i = 0; i < sw->we->num_of_workers; i++) {
 w = wc_get_worker_for_name(sw->we->worker_list[i], l);



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

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

[mturk]

Author: mturk
Date: Sun Nov 26 12:40:39 2006
New Revision: 479425

URL: http://svn.apache.org/viewvc?view=rev&rev=479425
Log:
Instead having Balancers: and Workers: use only
Workers: with balancer and ajp workers count.

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=479425&r1=479424&r2=479425
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 12:40:39 
2006
@@ -1910,8 +1910,7 @@
 ajp_cnt++;
 }
 }
-if (lb_cnt)
-jk_printf(s, "Balancers: size=%d\n", lb_cnt);
+jk_printf(s, "Workers: balancer=%d ajp=%d\n", lb_cnt, ajp_cnt);
 
 for (i = 0; i < sw->we->num_of_workers; i++) {
 w = wc_get_worker_for_name(sw->we->worker_list[i], l);
@@ -1925,8 +1924,6 @@
 display_worker_txt(s, w, 0, l);
 }
 }
-if (ajp_cnt)
-jk_printf(s, "Workers: size=%d\n", ajp_cnt);
 
 for (i = 0; i < sw->we->num_of_workers; i++) {
 w = wc_get_worker_for_name(sw->we->worker_list[i], l);



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

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

[mturk]

Author: mturk
Date: Sun Nov 26 12:54:59 2006
New Revision: 479427

URL: http://svn.apache.org/viewvc?view=rev&rev=479427
Log:
Update Legend. jvmRoute has nothing to do with JVM.

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=479427&r1=479426&r2=479427
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 12:54:59 
2006
@@ -1795,7 +1795,7 @@
 "\n"
 "NameWorker name\n"
 "TypeWorker type\n"
-"jvmRouteWorker JVM route\n"
+"RouteWorker jvmRoute\n"
 "AddrBackend Address info\n"
 "ActWorker activation configuration\n"
 "ACT=Active, DIS=Disabled, STP=Stopped\n"



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

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

[mturk]

Author: mturk
Date: Sun Nov 26 13:22:35 2006
New Revision: 479429

URL: http://svn.apache.org/viewvc?view=rev&rev=479429
Log:
Add ASL copyright to the status display.

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=479429&r1=479428&r2=479429
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 13:22:35 
2006
@@ -118,6 +118,10 @@
"DTD HTML 3.2 Final//EN\">\n"  \
"JK Status Manager"
 
+#define JK_STATUS_COPY "Copyright © 1999-2006, The Apache Software 
Foundation" \
+   "Licensed under the http://www.apache.org/licenses/LICENSE-2.0\";>" \
+   "Apache License, Version 2.0."
+
 #define JK_STATUS_HEND "\n\n"
 #define JK_STATUS_BEND "\n\n"
 
@@ -1788,7 +1792,7 @@
 
 
 
-static void display_legend(jk_ws_service_t *s, jk_logger_t *l)
+static void display_legend(jk_ws_service_t *s, status_worker_t *sw, 
jk_logger_t *l)
 {
 JK_TRACE_ENTER(l);
 jk_puts(s, "\n"
@@ -1816,7 +1820,16 @@
 "CdCluster domain\n"
 "RsRecovery scheduled\n"
 "\n"
-"");
+"\n");
+if (sw->css) {
+jk_putv(s, "", JK_STATUS_COPY,
+"\n", NULL);
+}
+else {
+jk_putv(s, "", JK_STATUS_COPY,
+"\n", NULL);
+}
+
 JK_TRACE_EXIT(l);
 }
 
@@ -1838,7 +1851,8 @@
 }
 display_worker(s, w, refresh, 0, l);
 }
-display_legend(s, l);
+display_legend(s, sw, l);
+
 JK_TRACE_EXIT(l);
 return JK_TRUE;
 }
@@ -1968,7 +1982,7 @@
 }
 /* XXX : Until now we use the lb view even if we only want to show a 
member */
 display_worker(s, w, refresh, 1, l);
-display_legend(s, l);
+display_legend(s, sw, l);
 JK_TRACE_EXIT(l);
 return JK_TRUE;
 }
@@ -2098,7 +2112,7 @@
 }
 form_member(s, wr, worker, from, refresh, l);
 }
-display_legend(s, l);
+display_legend(s, sw, l);
 JK_TRACE_EXIT(l);
 return JK_TRUE;
 }



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

Bug report for Tomcat 3 [2006/11/26]

[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/11/26]

[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/11/26]

[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/11/26]

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

[mturk]

Author: mturk
Date: Sun Nov 26 23:28:26 2006
New Revision: 479530

URL: http://svn.apache.org/viewvc?view=rev&rev=479530
Log:
Display the usage if not read-only.

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=479530&r1=479529&r2=479530
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Nov 26 23:28:26 
2006
@@ -2561,8 +2561,8 @@
 jk_puts(s, "\n");
 }
 jk_puts(s, "[S=Show only this worker");
-if (w->read_only)
-jk_puts(s, ", E=Edit worker, R=Reset 
worker state\n");
+if (!w->read_only)
+jk_puts(s, ", E=Edit worker, R=Reset 
worker state");
 jk_puts(s, "] \n");
 }
 if (cmd == JK_STATUS_CMD_LIST) {



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