removed setup_connection (merged [295])

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@512 152afb58-edef-0310-8abb-c4023f1b3aa9

1 files changed, 7 insertions, 22 deletions

diff --git a/src/mod_alias.c b/src/mod_alias.c
index b7a4c339..e4869493 100644
--- a/src/mod_alias.c
+++ b/src/mod_alias.c
@@ -93,16 +93,16 @@ SETDEFAULTS_FUNC(mod_alias_set_defaults) {
 
 #define PATCH(x) \
 	p->conf.x = s->x;
-static int mod_alias_patch_connection(server *srv, connection *con, plugin_data *p, const char *stage, size_t stage_len) {
+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];
-		plugin_config *s = p->config_storage[i];
-		
-		/* not our stage */
-		if (!buffer_is_equal_string(dc->comp_key, stage, stage_len)) continue;
+		s = p->config_storage[i];
 		
 		/* condition didn't match */
 		if (!config_check_cond(srv, con, dc)) continue;
@@ -119,32 +119,17 @@ static int mod_alias_patch_connection(server *srv, connection *con, plugin_data
 	
 	return 0;
 }
-
-static int mod_alias_setup_connection(server *srv, connection *con, plugin_data *p) {
-	plugin_config *s = p->config_storage[0];
-	UNUSED(srv);
-	UNUSED(con);
-		
-	PATCH(alias);
-	
-	return 0;
-}
 #undef PATCH
 
 PHYSICALPATH_FUNC(mod_alias_physical_handler) {
 	plugin_data *p = p_d;
 	int uri_len, basedir_len;
 	char *uri_ptr;
-	size_t k, i;
+	size_t k;
 	
 	if (con->physical.path->used == 0) return HANDLER_GO_ON;
 	
-	mod_alias_setup_connection(srv, con, p);
-	for (i = 0; i < srv->config_patches->used; i++) {
-		buffer *patch = srv->config_patches->ptr[i];
-		
-		mod_alias_patch_connection(srv, con, p, CONST_BUF_LEN(patch));
-	}
+	mod_alias_patch_connection(srv, con, p);
 	
 	/* not to include the tailing slash */
 	basedir_len = (con->physical.basedir->used - 1) - 1;