Author: rjung
Date: Fri Apr 18 06:04:49 2008
New Revision: 649511
URL: http://svn.apache.org/viewvc?rev=649511&view=rev
Log:
- Fix typo in changelog
- Fix typo in comment
- Add directive name to httpd config error messages
- Make httpd config info text consistent w.r.t. upper
case first word.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=649511&r1=649510&r2=649511&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Fri Apr 18 06:04:49
2008
@@ -1053,7 +1053,7 @@
return "JkWorkersFile file name invalid";
if (stat(jk_worker_file, &statbuf) == -1)
- return "Can't find the workers file specified";
+ return "JkWorkersFile: Can't find the workers file specified";
return NULL;
}
@@ -1085,7 +1085,7 @@
return "JkMountFile file name invalid";
if (stat(conf->mount_file, &statbuf) == -1)
- return "Can't find the mount file specified";
+ return "JkMountFile: Can't find the mount file specified";
if (!conf->uri_to_context) {
if (!jk_map_alloc(&(conf->uri_to_context))) {
@@ -1942,7 +1942,7 @@
* servlet requests.
*/
{"JkWorkersFile", jk_set_worker_file, NULL, RSRC_CONF, TAKE1,
- "the name of a worker file for the Tomcat servlet containers"},
+ "The name of a worker file for the Tomcat servlet containers"},
/*
* JkMountFile specifies a full path to the location of the
@@ -1952,7 +1952,7 @@
* to redirect servlet requests.
*/
{"JkMountFile", jk_set_mount_file, NULL, RSRC_CONF, TAKE1,
- "the name of a mount file for the Tomcat servlet uri mappings"},
+ "The name of a mount file for the Tomcat servlet uri mappings"},
/*
* JkMountFileReload specifies the reload check interval for the
@@ -1961,7 +1961,7 @@
* Default value is: JK_URIMAP_DEF_RELOAD
*/
{"JkMountFileReload", jk_set_mount_file_reload, NULL, RSRC_CONF, TAKE1,
- "the reload check interval of the mount file"},
+ "The reload check interval of the mount file"},
/*
* JkMount mounts a url prefix to a worker (the worker need to be
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=649511&r1=649510&r2=649511&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Fri Apr 18 06:04:49
2008
@@ -1080,7 +1080,7 @@
return "JkWorkersFile file name invalid";
if (jk_file_exists(jk_worker_file) != JK_TRUE)
- return "Can't find the workers file specified";
+ return "JkWorkersFile: Can't find the workers file specified";
return NULL;
}
@@ -1107,7 +1107,7 @@
return "JkMountFile file name invalid";
if (jk_file_exists(conf->mount_file) != JK_TRUE)
- return "Can't find the mount file specified";
+ return "JkMountFile: Can't find the mount file specified";
if (!conf->uri_to_context) {
if (!jk_map_alloc(&(conf->uri_to_context))) {
@@ -1160,7 +1160,7 @@
}
return NULL;
#else
- return "APR was compiled without threading support. Cannot create watchdog
thread";
+ return "JkWatchdogInterval: APR was compiled without threading support.
Cannot create watchdog thread";
#endif
}
@@ -1996,7 +1996,7 @@
* servlet requests.
*/
AP_INIT_TAKE1("JkWorkersFile", jk_set_worker_file, NULL, RSRC_CONF,
- "the name of a worker file for the Tomcat servlet
containers"),
+ "The name of a worker file for the Tomcat servlet
containers"),
/*
* JkMountFile specifies a full path to the location of the
@@ -2006,7 +2006,7 @@
* to redirect servlet requests.
*/
AP_INIT_TAKE1("JkMountFile", jk_set_mount_file, NULL, RSRC_CONF,
- "the name of a mount file for the Tomcat servlet uri
mapping"),
+ "The name of a mount file for the Tomcat servlet uri
mapping"),
/*
* JkMountFileReload specifies the reload check interval for the
@@ -2015,16 +2015,16 @@
* Default value is: JK_URIMAP_DEF_RELOAD
*/
AP_INIT_TAKE1("JkMountFileReload", jk_set_mount_file_reload, NULL,
RSRC_CONF,
- "the reload check interval of the mount file"),
+ "The reload check interval of the mount file"),
/*
* JkWatchdogInterval specifies the maintain interval for the
- * wathdog thread.
+ * watchdog thread.
*
* Default value is: 0 meaning watchdog thread will not be created
*/
AP_INIT_TAKE1("JkWatchdogInterval", jk_set_watchdog_interval, NULL,
RSRC_CONF,
- "maintain interval of the watchdog thread"),
+ "The maintain interval of the watchdog thread"),
/*
* JkMount mounts a url prefix to a worker (the worker need to be
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=649511&r1=649510&r2=649511&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Fri Apr 18
06:04:49 2008
@@ -45,7 +45,7 @@
<changelog>
<update>
Add JkWatchdogInterval directive for Apache 2.0
- that allows unatended maintenance of the workers. (mturk)
+ that allows unattended maintenance of the workers. (mturk)
</update>
<fix>
Fix docs for worker attribute "secret". (rjung)
@@ -56,8 +56,8 @@
</update>
<fix>
Do not put loadbalancer node in error state if there is opened
- channel. This fixes the bug when new new connection fails due to
- bussines, causing opened connections fail stickyness.
+ channel. This fixes the bug when new connection fails due to
+ busyness, causing opened connections fail stickyness.
This brings back per-node busy counter and private state array
for each request. We can mark the state as error for failover to
work while still operating and reporting node as OK if there are
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
