1 files changed, 55 insertions, 51 deletions

diff --git a/src/mod_alias.c b/src/mod_alias.c
index 23570e4..5b7b510 100644
--- a/src/mod_alias.c
+++ b/src/mod_alias.c
@@ -1,14 +1,14 @@
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
 #include "base.h"
 #include "log.h"
 #include "buffer.h"
 
 #include "plugin.h"
 
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
 /* plugin config for all request/connections */
 typedef struct {
 	array *alias;
@@ -16,44 +16,46 @@ typedef struct {
 
 typedef struct {
 	PLUGIN_DATA;
-	
+
 	plugin_config **config_storage;
-	
-	plugin_config conf; 
+
+	plugin_config conf;
 } plugin_data;
 
 /* init the plugin data */
 INIT_FUNC(mod_alias_init) {
 	plugin_data *p;
-	
+
 	p = calloc(1, sizeof(*p));
-	
-	
-	
+
+
+
 	return p;
 }
 
 /* detroy the plugin data */
 FREE_FUNC(mod_alias_free) {
 	plugin_data *p = p_d;
-	
+
 	if (!p) return HANDLER_GO_ON;
-	
+
 	if (p->config_storage) {
 		size_t i;
-		
+
 		for (i = 0; i < srv->config_context->used; i++) {
 			plugin_config *s = p->config_storage[i];
-			
+
+			if(!s) continue;
+
 			array_free(s->alias);
-			
+
 			free(s);
 		}
 		free(p->config_storage);
 	}
-	
+
 	free(p);
-	
+
 	return HANDLER_GO_ON;
 }
 
@@ -62,25 +64,25 @@ FREE_FUNC(mod_alias_free) {
 SETDEFAULTS_FUNC(mod_alias_set_defaults) {
 	plugin_data *p = p_d;
 	size_t i = 0;
-	
-	config_values_t cv[] = { 
+
+	config_values_t cv[] = {
 		{ "alias.url",                  NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION },       /* 0 */
 		{ NULL,                         NULL, T_CONFIG_UNSET,  T_CONFIG_SCOPE_UNSET }
 	};
-	
+
 	if (!p) return HANDLER_ERROR;
-	
+
 	p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *));
-	
+
 	for (i = 0; i < srv->config_context->used; i++) {
 		plugin_config *s;
-		
+
 		s = calloc(1, sizeof(plugin_config));
-		s->alias = array_init();	
+		s->alias = array_init();
 		cv[0].destination = s->alias;
-		
+
 		p->config_storage[i] = s;
-		
+
 		if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv)) {
 			return HANDLER_ERROR;
 		}
@@ -101,16 +103,15 @@ SETDEFAULTS_FUNC(mod_alias_set_defaults) {
 					}
 					/* ok, they have same prefix. check position */
 					if (a->sorted[j] < a->sorted[k]) {
-						fprintf(stderr, "url.alias: `%s' will never match as `%s' matched first\n",
-								key->ptr,
-								prefix->ptr);
+						log_error_write(srv, __FILE__, __LINE__, "SBSBS",
+							"url.alias: `", key, "' will never match as `", prefix, "' matched first");
 						return HANDLER_ERROR;
 					}
 				}
 			}
 		}
 	}
-	
+
 	return HANDLER_GO_ON;
 }
 
@@ -119,27 +120,27 @@ SETDEFAULTS_FUNC(mod_alias_set_defaults) {
 static int mod_alias_patch_connection(server *srv, connection *con, plugin_data *p) {
 	size_t i, j;
 	plugin_config *s = p->config_storage[0];
-	
+
 	PATCH(alias);
-	
+
 	/* skip the first, the global context */
 	for (i = 1; i < srv->config_context->used; i++) {
 		data_config *dc = (data_config *)srv->config_context->data[i];
 		s = p->config_storage[i];
-		
+
 		/* condition didn't match */
 		if (!config_check_cond(srv, con, dc)) continue;
-		
+
 		/* merge config */
 		for (j = 0; j < dc->value->used; j++) {
 			data_unset *du = dc->value->data[j];
-			
+
 			if (buffer_is_equal_string(du->key, CONST_STR_LEN("alias.url"))) {
 				PATCH(alias);
 			}
 		}
 	}
-	
+
 	return 0;
 }
 #undef PATCH
@@ -149,51 +150,54 @@ PHYSICALPATH_FUNC(mod_alias_physical_handler) {
 	int uri_len, basedir_len;
 	char *uri_ptr;
 	size_t k;
-	
+
 	if (con->physical.path->used == 0) return HANDLER_GO_ON;
-	
+
 	mod_alias_patch_connection(srv, con, p);
-	
+
 	/* not to include the tailing slash */
 	basedir_len = (con->physical.basedir->used - 1) - 1;
 	uri_len = con->physical.path->used - 1 - basedir_len;
 	uri_ptr = con->physical.path->ptr + basedir_len;
-	
+
 	for (k = 0; k < p->conf.alias->used; k++) {
 		data_string *ds = (data_string *)p->conf.alias->data[k];
 		int alias_len = ds->key->used - 1;
-		
+
 		if (alias_len > uri_len) continue;
 		if (ds->key->used == 0) continue;
-		
-		if (0 == strncmp(uri_ptr, ds->key->ptr, alias_len)) {
+
+		if (0 == (con->conf.force_lowercase_filenames ?
+					strncasecmp(uri_ptr, ds->key->ptr, alias_len) :
+					strncmp(uri_ptr, ds->key->ptr, alias_len))) {
 			/* matched */
-			
+
 			buffer_copy_string_buffer(con->physical.basedir, ds->value);
 			buffer_copy_string_buffer(srv->tmp_buf, ds->value);
 			buffer_append_string(srv->tmp_buf, uri_ptr + alias_len);
 			buffer_copy_string_buffer(con->physical.path, srv->tmp_buf);
-			
+
 			return HANDLER_GO_ON;
 		}
 	}
-	
+
 	/* not found */
 	return HANDLER_GO_ON;
 }
 
 /* this function is called at dlopen() time and inits the callbacks */
 
+int mod_alias_plugin_init(plugin *p);
 int mod_alias_plugin_init(plugin *p) {
 	p->version     = LIGHTTPD_VERSION_ID;
 	p->name        = buffer_init_string("alias");
-	
+
 	p->init           = mod_alias_init;
 	p->handle_physical= mod_alias_physical_handler;
 	p->set_defaults   = mod_alias_set_defaults;
 	p->cleanup        = mod_alias_free;
-	
+
 	p->data        = NULL;
-	
+
 	return 0;
 }