tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r439824 - in /tomcat/connectors/trunk/jk/native/common: jk_map.c jk_util.c jk_util.h
Date Sun, 03 Sep 2006 18:36:54 GMT
Author: rjung
Date: Sun Sep  3 11:36:53 2006
New Revision: 439824

URL: http://svn.apache.org/viewvc?view=rev&rev=439824
Log:
Add a third category of attributes, which are multi-line
and get joined with a comma.

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_map.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_map.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?view=diff&rev=439824&r1=439823&r2=439824
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_map.c Sun Sep  3 11:36:53 2006
@@ -390,7 +390,7 @@
                             sep = PATH_SEPERATOR;
                         else if (jk_is_cmd_line_property(prp))
                             sep = ' ';
-                        else if (!strcasecmp(prp, "worker.list"))
+                        else if (jk_is_list_property(prp))
                             sep = ',';
                         sprintf(tmpv, "%s%c%s", oldv, sep, v);
                     }

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=439824&r1=439823&r2=439824
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Sep  3 11:36:53 2006
@@ -119,6 +119,13 @@
     extern long _ftol2(double dblSource) { return _ftol(dblSource); }
 #endif
 
+static const char *list_properties[] = {
+    BALANCE_WORKERS,
+    MOUNT_OF_WORKER,
+    "list",
+    NULL
+};
+
 static const char *unique_properties[] = {
     SECRET_OF_WORKER,
     HOST_OF_WORKER,
@@ -1199,6 +1206,17 @@
 int jk_is_cmd_line_property(const char *prp_name)
 {
     return jk_is_some_property(prp_name, CMD_LINE_OF_WORKER, ".");
+}
+
+int jk_is_list_property(const char *prp_name)
+{
+    const char **props = &list_properties[0];
+    while (*props) {
+        if (jk_is_some_property(prp_name, *props, "."))
+            return JK_TRUE;
+        props++;
+    }
+    return JK_FALSE;
 }
 
 int jk_is_unique_property(const char *prp_name)

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=439824&r1=439823&r2=439824
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.h Sun Sep  3 11:36:53 2006
@@ -139,6 +139,8 @@
 
 int jk_file_exists(const char *f);
 
+int jk_is_list_property(const char *prp_name);
+
 int jk_is_path_property(const char *prp_name);
 
 int jk_is_cmd_line_property(const char *prp_name);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message