Author: mturk
Date: Sun Jun 4 01:44:19 2006
New Revision: 411539
URL: http://svn.apache.org/viewvc?rev=411539&view=rev
Log:
Add connection_min_poll_size directive.
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?rev=411539&r1=411538&r2=411539&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Jun 4 01:44:19 2006
@@ -48,6 +48,7 @@
#define TYPE_OF_WORKER ("type")
#define CACHE_OF_WORKER_DEPRECATED ("cachesize")
#define CACHE_OF_WORKER ("connection_pool_size")
+#define CACHE_OF_WORKER_MIN ("connection_min_pool_size")
#define CACHE_TIMEOUT_OF_WORKER ("cache_timeout")
#define RECOVERY_OPTS_OF_WORKER ("recovery_options")
#define CONNECT_TIMEOUT_OF_WORKER ("connect_timeout")
@@ -525,6 +526,18 @@
return jk_map_get_int(m, buf, def);
}
+int jk_get_worker_cache_size_min(jk_map_t *m, const char *wname, int def)
+{
+ char buf[1024];
+
+ if (!m || !wname) {
+ return -1;
+ }
+
+ MAKE_WORKER_PARAM(CACHE_OF_WORKER_MIN);
+ return jk_map_get_int(m, buf, def);
+}
+
int jk_get_worker_socket_timeout(jk_map_t *m, const char *wname, int def)
{
char buf[1024];
@@ -1069,6 +1082,8 @@
TYPE_OF_WORKER,
CACHE_OF_WORKER,
CACHE_OF_WORKER_DEPRECATED,
+ CACHE_OF_WORKER,
+ CACHE_OF_WORKER_MIN,
CACHE_TIMEOUT_OF_WORKER,
RECOVERY_OPTS_OF_WORKER,
CONNECT_TIMEOUT_OF_WORKER,
@@ -1094,9 +1109,33 @@
NULL
};
+static const char *deprecated_properties[] = {
+ CACHE_OF_WORKER_DEPRECATED,
+ MX_OF_WORKER,
+ MS_OF_WORKER,
+ CP_OF_WORKER,
+ BRIDGE_OF_WORKER,
+ JVM_OF_WORKER,
+ LIBPATH_OF_WORKER,
+ CMD_LINE_OF_WORKER,
+ NATIVE_LIB_OF_WORKER,
+ NULL
+};
+
int jk_is_unique_property(const char *prp_name)
{
const char **props = &unique_properties[0];
+ while (*props) {
+ if (jk_is_some_property(prp_name, *props))
+ return JK_TRUE;
+ props++;
+ }
+ return JK_FALSE;
+}
+
+int jk_is_deprecated_property(const char *prp_name)
+{
+ const char **props = &deprecated_properties[0];
while (*props) {
if (jk_is_some_property(prp_name, *props))
return JK_TRUE;
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?rev=411539&r1=411538&r2=411539&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Sun Jun 4 01:44:19 2006
@@ -55,6 +55,8 @@
int jk_get_worker_cache_size(jk_map_t *m, const char *wname, int def);
+int jk_get_worker_cache_size_min(jk_map_t *m, const char *wname, int def);
+
int jk_get_worker_socket_timeout(jk_map_t *m, const char *wname, int def);
int jk_get_worker_socket_buffer(jk_map_t *m, const char *wname, int def);
@@ -136,6 +138,8 @@
int jk_is_cmd_line_poperty(const char *prp_name);
int jk_is_unique_property(const char *prp_name);
+
+int jk_is_deprecated_property(const char *prp_name);
int jk_get_worker_stdout(jk_map_t *m, const char *wname, const char
**stdout_name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
