Ticket #1546: lighttpd-1.4.11-mod_geoip_default_country_code.patch

src/mod_geoip.c

@@ -63 +63 @@
 typedef struct {
         unsigned short mem_cache;
         buffer  *db_name;
+        buffer *default_country_code;
         GeoIP   *gi;
 } plugin_config;
 
@@ -100 +101 @@
                         if (!s) continue;
                         
                         buffer_free(s->db_name);
+                        buffer_free(s->default_country_code);
                         
                         /* clean up */
                         GeoIP_delete(s->gi);
@@ -123 +125 @@
         config_values_t cv[] = { 
                 { "geoip.db-filename",  NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },     /* 0 */
                 { "geoip.memory-cache", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },    /* 1 */
+                { "geoip.default_country_code", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },    /* 2 */
                 { NULL,                 NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
         };
         
@@ -138 +141 @@
                 
                 s->db_name = buffer_init();
                 s->mem_cache = 0; /* default: do not load db to cache */
+                s->default_country_code = buffer_init();
                 s->gi = NULL;
 
                 cv[0].destination = s->db_name;
                 cv[1].destination = &(s->mem_cache);
+                cv[2].destination = s->default_country_code;
 
                 p->config_storage[i] = s;
         
@@ -159 +164 @@
                                 mode = GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE;
 
                         if (NULL == (s->gi = GeoIP_open(s->db_name->ptr, mode))) {
-                                log_error_write(srv, __FILE__, __LINE__, "s",
-                                        "failed to open GeoIP database!!!");
+                                log_error_write(srv, __FILE__, __LINE__, "ss",
+                                        "failed to open GeoIP database: ", s->db_name->ptr);
 
                                 return HANDLER_ERROR;
                         }
@@ -216 +221 @@
 
 URIHANDLER_FUNC(mod_geoip_subrequest) {
         plugin_data *p = p_d;
+                plugin_config *s = p->config_storage[0];
 
         mod_geoip_patch_connection(srv, con, p);
 
@@ -238 +245 @@
                                         buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE");
                                         buffer_copy_string(ds->value, returnedCountry);
                                         array_insert_unique(con->environment, (data_unset *)ds);
+                                } else {
+                                        if(s->default_country_code->used > 0) {
+                                                if (NULL == (ds = (data_string *)array_get_unused_element(con->environment, TYPE_STRING))) {
+                                                        ds = data_string_init();
+                                                }
+                                                
+                                                buffer_copy_string(ds->key, "GEOIP_COUNTRY_CODE");
+                                                buffer_copy_string(ds->value, s->default_country_code->ptr);
+                                                array_insert_unique(con->environment, (data_unset *)ds);        
+                                        }
                                 }
                         }
 
@@ -406 +423 @@
         p->name        = buffer_init_string("geoip");
         
         p->init        = mod_geoip_init;
-        p->handle_subrequest_start = mod_geoip_subrequest;
+//      p->handle_subrequest_start = mod_geoip_subrequest;
+        p->handle_uri_clean = mod_geoip_subrequest;
         p->set_defaults  = mod_geoip_set_defaults;
         p->cleanup     = mod_geoip_free;