Changeset 434

Timestamp:

07/09/2005 08:18:10 PM (3 years ago)

Author:

jan

Message:

fixed compile if memcached and/or gdbm are not available

Files:

• branches/lighttpd-1.3.x/src/mod_trigger_b4_dl.c (modified) (9 diffs)

branches/lighttpd-1.3.x/src/mod_trigger_b4_dl.c

@@ -105 +105 @@
 #endif
 #if defined(HAVE_GDBM_H)
-                        if (s->db) {
-                                gdbm_close(s->db);
-                        }
+                        if (s->db) gdbm_close(s->db);
 #endif
 #if defined(HAVE_MEMCACHE_H)
-                        if (s->mc) {
-                                mc_free(s->mc);
-                        }
+                        if (s->mc) mc_free(s->mc);
 #endif
                         
@@ -163 +159 @@
                 s->deny_url       = buffer_init();
                 s->mc_hosts       = array_init();
+                s->mc_namespace   = buffer_init();
                 
                 cv[0].destination = s->db_filename;
@@ -333 +330 @@
         }
         
-        if (!p->conf.trigger_regex || !p->conf.download_regex || (!p->conf.db && !p->conf.mc)) return HANDLER_GO_ON;
+        if (!p->conf.trigger_regex || !p->conf.download_regex) return HANDLER_GO_ON;
+        
+# if !defined(HAVE_GDBM_H) && !defined(HAVE_MEMCACHE_H)
+        return HANDLER_GO_ON;
+# elif defined(HAVE_GDBM_H) && defined(HAVE_MEMCACHE_H)
+        if (!p->conf.db && !p->conf.mc) return HANDLER_GO_ON;
+        if (p->conf.db && p->conf.mc) {
+                /* can't decide which one */
+                
+                return HANDLER_GO_ON;
+        }
+# elif defined(HAVE_GDBM_H)
+        if (!p->conf.db) return HANDLER_GO;
+# else
+        if (!p->conf.mc) return HANDLER_GO;
+# endif
         
         if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "X-Forwarded-For"))) {
@@ -352 +364 @@
                 }
         } else {
+# if defined(HAVE_GDBM_H)
                 if (p->conf.db) {
-# if defined(HAVE_GDBM_H)
                         /* the trigger matched */
                         datum key, val;
@@ -367 +379 @@
                                                 "insert failed");
                         }
+                }
 # endif
-                } else if (p->conf.mc) {
-# if defined(HAVE_MEMCACHE_H)
+# if defined(HAVE_MEMCACHE_H)           
+                if (p->conf.mc) {
                         buffer_copy_string_buffer(p->tmp_buf, p->conf.mc_namespace);
                         buffer_append_string(p->tmp_buf, remote_ip);
@@ -380 +393 @@
                                                 "insert failed");
                         }
+                }
 # endif
-                }
         }
                 
@@ -393 +406 @@
         } else {
                 /* the download uri matched */
-                time_t last_hit;
-                
+# if defined(HAVE_GDBM_H)               
                 if (p->conf.db) {
-# if defined(HAVE_GDBM_H)
                         datum key, val;
+                        time_t last_hit;
                 
                         key.dptr = (char *)remote_ip;
@@ -448 +460 @@
                                                 "insert failed");
                         }
+                }
 # endif
-                } else if (p->conf.mc) {
-# if defined(HAVE_MEMCACHE_H)
+                
+# if defined(HAVE_MEMCACHE_H)           
+                if (p->conf.mc) {
                         void *r;
                         
@@ -483 +497 @@
                                                 "insert failed");
                         }
+                }
 # endif
-                }
         }