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, 8 insertions, 23 deletions

diff --git a/src/mod_scgi.c b/src/mod_scgi.c
index 63e0aa21..7f0b579d 100644
--- a/src/mod_scgi.c
+++ b/src/mod_scgi.c
@@ -2592,16 +2592,17 @@ static handler_t scgi_handle_fdevent(void *s, void *ctx, int revents) {
 }
 #define PATCH(x) \
 	p->conf.x = s->x;
-static int scgi_patch_connection(server *srv, connection *con, plugin_data *p, const char *stage, size_t stage_len) {
+static int scgi_patch_connection(server *srv, connection *con, plugin_data *p) {
 	size_t i, j;
+	plugin_config *s = p->config_storage[0];
+	
+	PATCH(exts);
+	PATCH(debug);
 	
 	/* 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;
@@ -2620,17 +2621,6 @@ static int scgi_patch_connection(server *srv, connection *con, plugin_data *p, c
 	
 	return 0;
 }
-
-static int scgi_setup_connection(server *srv, connection *con, plugin_data *p) {
-	plugin_config *s = p->config_storage[0];
-	UNUSED(srv);
-	UNUSED(con);
-	
-	PATCH(exts);
-	PATCH(debug);
-	
-	return 0;
-}
 #undef PATCH
 
 
@@ -2639,7 +2629,7 @@ static handler_t scgi_check_extension(server *srv, connection *con, void *p_d, i
 	size_t s_len;
 	int used = -1;
 	int ndx;
-	size_t k, i;
+	size_t k;
 	buffer *fn;
 	scgi_extension *extension = NULL;
 	size_t path_info_offset;
@@ -2656,12 +2646,7 @@ static handler_t scgi_check_extension(server *srv, connection *con, void *p_d, i
 	s_len = fn->used - 1;
 	
 	/* select the right config */
-	scgi_setup_connection(srv, con, p);
-	for (i = 0; i < srv->config_patches->used; i++) {
-		buffer *patch = srv->config_patches->ptr[i];
-		
-		scgi_patch_connection(srv, con, p, CONST_BUF_LEN(patch));
-	}
+	scgi_patch_connection(srv, con, p);
 
 	path_info_offset = 0;