Changeset 1714

Timestamp:

08/02/08 20:09:12 (5 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/config_reader.c (modified) (3 diffs)

cherokee/trunk/ChangeLog

@@ +1 @@
+2008-08-02  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/config_reader.c (cherokee_config_reader_parse_string):
+        Fixes the change about forcing the properties to be lowcase. It
+        was a mistake, actually. There are certain entries that should be
+        written in uppercase such as environment variables. This patch
+        removes the lower-case restriction and adds a check to ensure that
+        there is not entry with the case name and different case as child
+        of the same configuration node. Eg: vserver!001!example and
+        vserver!001!Example.
+
-2008-08-01  Taher Shihadeh <taher@unixwars.com>
-

cherokee/trunk/cherokee/config_reader.c

@@ -114 +114 @@
-
-
+static ret_t
+check_config_node_sanity (cherokee_config_node_t *conf)
+{
+        cherokee_list_t *i, *j;
+        int              re;
+
+        /* Finds duplicate properties written in lower/upper-case
+         */
+        cherokee_config_node_foreach (i, conf) 
+        {
+                cherokee_config_node_foreach (j, conf) 
+                {
+                        if (i == j)
+                                continue;
+
+                        re = cherokee_buffer_case_cmp_buf (&CONFIG_NODE(i)->key, 
+                                                           &CONFIG_NODE(j)->key);
+                        if (re == 0) {
+                                PRINT_ERROR ("ERROR: '%s' and '%s' as child of the same node.\n",
+                                             CONFIG_NODE(i)->key.buf, CONFIG_NODE(j)->key.buf);
+                                return ret_error;
+                        }
+                }
+        }
+
+        return ret_ok;
+}
+
+
-ret_t 
-cherokee_config_reader_parse_string (cherokee_config_node_t *conf, cherokee_buffer_t *buf)
@@ -169 +198 @@
-                        while (*tmp == ' ') tmp--;
-                        cherokee_buffer_add (&key, begin, (tmp + 1) - begin);
-                        cherokee_buffer_to_lowcase (&key);
-                        
-                        tmp = equal + 3;
@@ -198 +226 @@
-        cherokee_buffer_mrproper (&key);
-        cherokee_buffer_mrproper (&val);
+
+        /* Sanity check
+         */
+        ret = check_config_node_sanity (conf);
+        if (ret != ret_ok)
+                return ret;
+        
-        return ret_ok;
-