Changeset 1811

Timestamp:

04/19/2007 09:06:44 PM (17 months ago)

Author:

jan

Message:

fixed the reset of the conditional cache in mod-magnet

Location:

trunk/src

Files:

• configfile-glue.c (modified) (2 diffs)
• configfile.h (modified) (1 diff)
• mod_magnet.c (modified) (1 diff)

trunk/src/configfile-glue.c

@@ -534 +534 @@
 }
 
-void config_cond_cache_reset(server *srv, connection *con) {
-        size_t i;
-
-        for (i = 0; i < srv->config_context->used - 1; i++) {
-                con->cond_cache[i].result = COND_RESULT_UNSET;
-                con->cond_cache[i].patterncount = 0;
-                con->cond_cache[i].comp_value = NULL;
-        }
-
-        for (i = 0; i < COMP_LAST_ELEMENT; i++) {
-                con->conditional_is_valid[i] = 0;
-        }
-}
-
+/**
+ * reset the config-cache for a named item
+ *
+ * if the item is COND_LAST_ELEMENT we reset all items
+ */
 void config_cond_cache_reset_item(server *srv, connection *con, comp_key_t item) {
         size_t i;
 
         for (i = 0; i < srv->config_context->used; i++) {
-                if (con->cond_cache[i].comp_type == item) {
+                if (item == COMP_LAST_ELEMENT || 
+                    con->cond_cache[i].comp_type == item) {
                         con->cond_cache[i].result = COND_RESULT_UNSET;
                         con->cond_cache[i].patterncount = 0;
@@ -560 +552 @@
 }
 
+/**
+ * reset the config cache to its initial state at connection start
+ */
+void config_cond_cache_reset(server *srv, connection *con) {
+        size_t i;
+
+        config_cond_cache_reset_all_items(srv, con);
+
+        for (i = 0; i < COMP_LAST_ELEMENT; i++) {
+                con->conditional_is_valid[i] = 0;
+        }
+}
 
 int config_check_cond(server *srv, connection *con, data_config *dc) {

trunk/src/configfile.h

@@ -25 +25 @@
 LI_API void config_cond_cache_reset_item(server *srv, connection *con, comp_key_t item);
 
+#define config_cond_cache_reset_all_items(srv, con) \
+        config_cond_cache_reset_item(srv, con, COMP_LAST_ELEMENT);
+
 #endif

trunk/src/mod_magnet.c

@@ -835 +835 @@
 
         /* reset conditional cache. */
-        for (i = 0; i < COMP_LAST_ELEMENT; i++) {
-                config_cond_cache_reset_item(srv, con, i);
-        }
+        config_cond_cache_reset_all_items(srv, con);
 
         return ret;