Imported Upstream version 1.4.13~r1370upstream/1.4.13_r1370

1 files changed, 264 insertions, 264 deletions

diff --git a/src/mod_cgi.c b/src/mod_cgi.c
index a6f8756..15aca3c 100644
--- a/src/mod_cgi.c
+++ b/src/mod_cgi.c
@@ -40,7 +40,7 @@ enum {EOL_UNSET, EOL_N, EOL_RN};
 
 typedef struct {
 	char **ptr;
-
+	
 	size_t size;
 	size_t used;
 } char_array;
@@ -58,23 +58,23 @@ typedef struct {
 typedef struct {
 	PLUGIN_DATA;
 	buffer_pid_t cgi_pid;
-
+	
 	buffer *tmp_buf;
 	buffer *parse_response;
-
+	
 	plugin_config **config_storage;
-
-	plugin_config conf;
+	
+	plugin_config conf; 
 } plugin_data;
 
 typedef struct {
 	pid_t pid;
 	int fd;
 	int fde_ndx; /* index into the fd-event buffer */
-
+	
 	connection *remote_conn;  /* dumb pointer */
 	plugin_data *plugin_data; /* dumb pointer */
-
+	
 	buffer *response;
 	buffer *response_header;
 } handler_ctx;
@@ -83,17 +83,17 @@ static handler_ctx * cgi_handler_ctx_init() {
 	handler_ctx *hctx = calloc(1, sizeof(*hctx));
 
 	assert(hctx);
-
+	
 	hctx->response = buffer_init();
 	hctx->response_header = buffer_init();
-
+	
 	return hctx;
 }
 
 static void cgi_handler_ctx_free(handler_ctx *hctx) {
 	buffer_free(hctx->response);
 	buffer_free(hctx->response_header);
-
+	
 	free(hctx);
 }
 
@@ -101,14 +101,14 @@ enum {FDEVENT_HANDLED_UNSET, FDEVENT_HANDLED_FINISHED, FDEVENT_HANDLED_NOT_FINIS
 
 INIT_FUNC(mod_cgi_init) {
 	plugin_data *p;
-
+	
 	p = calloc(1, sizeof(*p));
 
 	assert(p);
-
+	
 	p->tmp_buf = buffer_init();
 	p->parse_response = buffer_init();
-
+	
 	return p;
 }
 
@@ -116,62 +116,62 @@ INIT_FUNC(mod_cgi_init) {
 FREE_FUNC(mod_cgi_free) {
 	plugin_data *p = p_d;
 	buffer_pid_t *r = &(p->cgi_pid);
-
+	
 	UNUSED(srv);
-
+	
 	if (p->config_storage) {
 		size_t i;
 		for (i = 0; i < srv->config_context->used; i++) {
 			plugin_config *s = p->config_storage[i];
-
+			
 			array_free(s->cgi);
-
+			
 			free(s);
 		}
 		free(p->config_storage);
 	}
-
+	
 
 	if (r->ptr) free(r->ptr);
-
+	
 	buffer_free(p->tmp_buf);
 	buffer_free(p->parse_response);
-
+	
 	free(p);
-
+	
 	return HANDLER_GO_ON;
 }
 
 SETDEFAULTS_FUNC(mod_fastcgi_set_defaults) {
 	plugin_data *p = p_d;
 	size_t i = 0;
-
-	config_values_t cv[] = {
+	
+	config_values_t cv[] = { 
 		{ "cgi.assign",                  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));
 		assert(s);
-
+		
 		s->cgi    = array_init();
-
+		
 		cv[0].destination = s->cgi;
-
+		
 		p->config_storage[i] = s;
-
+	
 		if (0 != config_insert_values_global(srv, ((data_config *)srv->config_context->data[i])->value, cv)) {
 			return HANDLER_ERROR;
 		}
 	}
-
+	
 	return HANDLER_GO_ON;
 }
 
@@ -180,13 +180,13 @@ static int cgi_pid_add(server *srv, plugin_data *p, pid_t pid) {
 	int m = -1;
 	size_t i;
 	buffer_pid_t *r = &(p->cgi_pid);
-
+	
 	UNUSED(srv);
 
 	for (i = 0; i < r->used; i++) {
 		if (r->ptr[i] > m) m = r->ptr[i];
 	}
-
+	
 	if (r->size == 0) {
 		r->size = 16;
 		r->ptr = malloc(sizeof(*r->ptr) * r->size);
@@ -194,31 +194,31 @@ static int cgi_pid_add(server *srv, plugin_data *p, pid_t pid) {
 		r->size += 16;
 		r->ptr = realloc(r->ptr, sizeof(*r->ptr) * r->size);
 	}
-
+	
 	r->ptr[r->used++] = pid;
-
+	
 	return m;
 }
 
 static int cgi_pid_del(server *srv, plugin_data *p, pid_t pid) {
 	size_t i;
 	buffer_pid_t *r = &(p->cgi_pid);
-
+	
 	UNUSED(srv);
 
 	for (i = 0; i < r->used; i++) {
 		if (r->ptr[i] == pid) break;
 	}
-
+	
 	if (i != r->used) {
 		/* found */
-
+		
 		if (i != r->used - 1) {
 			r->ptr[i] = r->ptr[r->used - 1];
 		}
 		r->used--;
 	}
-
+	
 	return 0;
 }
 
@@ -226,32 +226,32 @@ static int cgi_response_parse(server *srv, connection *con, plugin_data *p, buff
 	char *ns;
 	const char *s;
 	int line = 0;
-
+	
 	UNUSED(srv);
-
+	
 	buffer_copy_string_buffer(p->parse_response, in);
-
-	for (s = p->parse_response->ptr;
-	     NULL != (ns = (eol == EOL_RN ? strstr(s, "\r\n") : strchr(s, '\n')));
+	
+	for (s = p->parse_response->ptr; 
+	     NULL != (ns = (eol == EOL_RN ? strstr(s, "\r\n") : strchr(s, '\n'))); 
 	     s = ns + (eol == EOL_RN ? 2 : 1), line++) {
 		const char *key, *value;
 		int key_len;
 		data_string *ds;
-
+		
 		ns[0] = '\0';
-
-		if (line == 0 &&
+		
+		if (line == 0 && 
 		    0 == strncmp(s, "HTTP/1.", 7)) {
 			/* non-parsed header ... we parse them anyway */
-
+			
 			if ((s[7] == '1' ||
 			     s[7] == '0') &&
 			    s[8] == ' ') {
 				int status;
 				/* after the space should be a status code for us */
-
+				
 				status = strtol(s+9, NULL, 10);
-
+				
 				if (con->http_status >= 100 &&
 				    con->http_status < 1000) {
 					/* we expected 3 digits and didn't got them */
@@ -260,27 +260,27 @@ static int cgi_response_parse(server *srv, connection *con, plugin_data *p, buff
 				}
 			}
 		} else {
-
+		
 			key = s;
 			if (NULL == (value = strchr(s, ':'))) {
 				/* we expect: "<key>: <value>\r\n" */
 				continue;
 			}
-
+			
 			key_len = value - key;
 			value += 1;
-
+			
 			/* skip LWS */
 			while (*value == ' ' || *value == '\t') value++;
-
+			
 			if (NULL == (ds = (data_string *)array_get_unused_element(con->response.headers, TYPE_STRING))) {
 				ds = data_response_init();
 			}
 			buffer_copy_string_len(ds->key, key, key_len);
 			buffer_copy_string(ds->value, value);
-
+			
 			array_insert_unique(con->response.headers, (data_unset *)ds);
-
+			
 			switch(key_len) {
 			case 4:
 				if (0 == strncasecmp(key, "Date", key_len)) {
@@ -315,13 +315,13 @@ static int cgi_response_parse(server *srv, connection *con, plugin_data *p, buff
 			}
 		}
 	}
-
+	
 	/* CGI/1.1 rev 03 - 7.2.1.2 */
 	if ((con->parsed_response & HTTP_LOCATION) &&
 	    !(con->parsed_response & HTTP_STATUS)) {
 		con->http_status = 302;
 	}
-
+	
 	return 0;
 }
 
@@ -329,10 +329,10 @@ static int cgi_response_parse(server *srv, connection *con, plugin_data *p, buff
 static int cgi_demux_response(server *srv, handler_ctx *hctx) {
 	plugin_data *p    = hctx->plugin_data;
 	connection  *con  = hctx->remote_conn;
-
+	
 	while(1) {
 		int n;
-
+		
 		buffer_prepare_copy(hctx->response, 1024);
 		if (-1 == (n = read(hctx->fd, hctx->response->ptr, hctx->response->size - 1))) {
 			if (errno == EAGAIN || errno == EINTR) {
@@ -343,125 +343,125 @@ static int cgi_demux_response(server *srv, handler_ctx *hctx) {
 			log_error_write(srv, __FILE__, __LINE__, "sdd", strerror(errno), con->fd, hctx->fd);
 			return FDEVENT_HANDLED_ERROR;
 		}
-
+		
 		if (n == 0) {
 			/* read finished */
-
+			
 			con->file_finished = 1;
-
+			
 			/* send final chunk */
 			http_chunk_append_mem(srv, con, NULL, 0);
 			joblist_append(srv, con);
-
+			
 			return FDEVENT_HANDLED_FINISHED;
 		}
-
+		
 		hctx->response->ptr[n] = '\0';
 		hctx->response->used = n+1;
-
+		
 		/* split header from body */
-
+		
 		if (con->file_started == 0) {
 			char *c;
 			int in_header = 0;
 			int header_end = 0;
 			int cp, eol = EOL_UNSET;
 			size_t used = 0;
-
+			
 			buffer_append_string_buffer(hctx->response_header, hctx->response);
-
+			
 			/* nph (non-parsed headers) */
 			if (0 == strncmp(hctx->response_header->ptr, "HTTP/1.", 7)) in_header = 1;
-
+			
 			/* search for the \r\n\r\n or \n\n in the string */
 			for (c = hctx->response_header->ptr, cp = 0, used = hctx->response_header->used - 1; used; c++, cp++, used--) {
 				if (*c == ':') in_header = 1;
 				else if (*c == '\n') {
 					if (in_header == 0) {
 						/* got a response without a response header */
-
+						
 						c = NULL;
 						header_end = 1;
 						break;
 					}
-
+					
 					if (eol == EOL_UNSET) eol = EOL_N;
-
+					
 					if (*(c+1) == '\n') {
 						header_end = 1;
 						break;
 					}
-
+					
 				} else if (used > 1 && *c == '\r' && *(c+1) == '\n') {
 					if (in_header == 0) {
 						/* got a response without a response header */
-
+						
 						c = NULL;
 						header_end = 1;
 						break;
 					}
-
+					
 					if (eol == EOL_UNSET) eol = EOL_RN;
-
+					
 					if (used > 3 &&
-					    *(c+2) == '\r' &&
+					    *(c+2) == '\r' && 
 					    *(c+3) == '\n') {
 						header_end = 1;
 						break;
 					}
-
+					
 					/* skip the \n */
 					c++;
 					cp++;
 					used--;
 				}
 			}
-
+			
 			if (header_end) {
 				if (c == NULL) {
 					/* no header, but a body */
-
+					
 					if (con->request.http_version == HTTP_VERSION_1_1) {
 						con->response.transfer_encoding = HTTP_TRANSFER_ENCODING_CHUNKED;
 					}
-
+					
 					http_chunk_append_mem(srv, con, hctx->response_header->ptr, hctx->response_header->used);
 					joblist_append(srv, con);
 				} else {
 					size_t hlen = c - hctx->response_header->ptr + (eol == EOL_RN ? 4 : 2);
 					size_t blen = hctx->response_header->used - hlen - 1;
-
+				
 					/* a small hack: terminate after at the second \r */
 					hctx->response_header->used = hlen + 1 - (eol == EOL_RN ? 2 : 1);
 					hctx->response_header->ptr[hlen - (eol == EOL_RN ? 2 : 1)] = '\0';
-
+				
 					/* parse the response header */
 					cgi_response_parse(srv, con, p, hctx->response_header, eol);
-
+					
 					/* enable chunked-transfer-encoding */
 					if (con->request.http_version == HTTP_VERSION_1_1 &&
 					    !(con->parsed_response & HTTP_CONTENT_LENGTH)) {
 						con->response.transfer_encoding = HTTP_TRANSFER_ENCODING_CHUNKED;
 					}
-
+					
 					if ((hctx->response->used != hlen) && blen > 0) {
 						http_chunk_append_mem(srv, con, c + (eol == EOL_RN ? 4: 2), blen + 1);
 						joblist_append(srv, con);
 					}
 				}
-
+				
 				con->file_started = 1;
 			}
 		} else {
 			http_chunk_append_mem(srv, con, hctx->response->ptr, hctx->response->used);
 			joblist_append(srv, con);
 		}
-
-#if 0
+		
+#if 0		
 		log_error_write(srv, __FILE__, __LINE__, "ddss", con->fd, hctx->fd, connection_get_state(con->state), b->ptr);
 #endif
 	}
-
+	
 	return FDEVENT_HANDLED_NOT_FINISHED;
 }
 
@@ -470,42 +470,42 @@ static handler_t cgi_connection_close(server *srv, handler_ctx *hctx) {
 	pid_t pid;
 	plugin_data *p;
 	connection  *con;
-
+	
 	if (NULL == hctx) return HANDLER_GO_ON;
-
+	
 	p    = hctx->plugin_data;
 	con  = hctx->remote_conn;
-
+	
 	if (con->mode != p->id) return HANDLER_GO_ON;
 
 #ifndef __WIN32
-
+	
 	/* the connection to the browser went away, but we still have a connection
-	 * to the CGI script
+	 * to the CGI script 
 	 *
 	 * close cgi-connection
 	 */
-
+	
 	if (hctx->fd != -1) {
 		/* close connection to the cgi-script */
 		fdevent_event_del(srv->ev, &(hctx->fde_ndx), hctx->fd);
 		fdevent_unregister(srv->ev, hctx->fd);
-
+		
 		if (close(hctx->fd)) {
 			log_error_write(srv, __FILE__, __LINE__, "sds", "cgi close failed ", hctx->fd, strerror(errno));
 		}
-
+		
 		hctx->fd = -1;
 		hctx->fde_ndx = -1;
 	}
-
+	
 	pid = hctx->pid;
-
+	
 	con->plugin_ctx[p->id] = NULL;
-
+	
 	/* is this a good idea ? */
 	cgi_handler_ctx_free(hctx);
-
+	
 	/* if waitpid hasn't been called by response.c yet, do it here */
 	if (pid) {
 		/* check if the CGI-script is already gone */
@@ -519,19 +519,19 @@ static handler_t cgi_connection_close(server *srv, handler_ctx *hctx) {
 		case -1:
 			/* */
 			if (errno == EINTR) break;
-
-			/*
-			 * errno == ECHILD happens if _subrequest catches the process-status before
+			
+			/* 
+			 * errno == ECHILD happens if _subrequest catches the process-status before 
 			 * we have read the response of the cgi process
-			 *
+			 * 
 			 * -> catch status
 			 * -> WAIT_FOR_EVENT
 			 * -> read response
 			 * -> we get here with waitpid == ECHILD
-			 *
+			 * 
 			 */
 			if (errno == ECHILD) return HANDLER_GO_ON;
-
+			
 			log_error_write(srv, __FILE__, __LINE__, "ss", "waitpid failed: ", strerror(errno));
 			return HANDLER_ERROR;
 		default:
@@ -541,13 +541,13 @@ static handler_t cgi_connection_close(server *srv, handler_ctx *hctx) {
 				con->http_status = 500;
 				con->mode = DIRECT;
 			}
-
+				
 			if (WIFEXITED(status)) {
 #if 0
 				log_error_write(srv, __FILE__, __LINE__, "sd", "(debug) cgi exited fine, pid:", pid);
 #endif
 				pid = 0;
-
+				
 				return HANDLER_GO_ON;
 			} else {
 				log_error_write(srv, __FILE__, __LINE__, "sd", "cgi died, pid:", pid);
@@ -555,20 +555,20 @@ static handler_t cgi_connection_close(server *srv, handler_ctx *hctx) {
 				return HANDLER_GO_ON;
 			}
 		}
-
-
+		
+	
 		kill(pid, SIGTERM);
-
+		
 		/* cgi-script is still alive, queue the PID for removal */
 		cgi_pid_add(srv, p, pid);
 	}
-#endif
+#endif	
 	return HANDLER_GO_ON;
 }
 
 static handler_t cgi_connection_close_callback(server *srv, connection *con, void *p_d) {
 	plugin_data *p = p_d;
-
+	
 	return cgi_connection_close(srv, con->plugin_ctx[p->id]);
 }
 
@@ -577,43 +577,43 @@ static handler_t cgi_handle_fdevent(void *s, void *ctx, int revents) {
 	server      *srv  = (server *)s;
 	handler_ctx *hctx = ctx;
 	connection  *con  = hctx->remote_conn;
-
+	
 	joblist_append(srv, con);
-
+	
 	if (hctx->fd == -1) {
 		log_error_write(srv, __FILE__, __LINE__, "ddss", con->fd, hctx->fd, connection_get_state(con->state), "invalid cgi-fd");
-
+		
 		return HANDLER_ERROR;
 	}
-
+	
 	if (revents & FDEVENT_IN) {
 		switch (cgi_demux_response(srv, hctx)) {
 		case FDEVENT_HANDLED_NOT_FINISHED:
 			break;
 		case FDEVENT_HANDLED_FINISHED:
 			/* we are done */
-
+			
 #if 0
 			log_error_write(srv, __FILE__, __LINE__, "ddss", con->fd, hctx->fd, connection_get_state(con->state), "finished");
 #endif
 			cgi_connection_close(srv, hctx);
-
-			/* if we get a IN|HUP and have read everything don't exec the close twice */
+			
+			/* if we get a IN|HUP and have read everything don't exec the close twice */ 
 			return HANDLER_FINISHED;
 		case FDEVENT_HANDLED_ERROR:
 			connection_set_state(srv, con, CON_STATE_HANDLE_REQUEST);
 			con->http_status = 500;
 			con->mode = DIRECT;
-
+			
 			log_error_write(srv, __FILE__, __LINE__, "s", "demuxer failed: ");
 			break;
 		}
 	}
-
+	
 	if (revents & FDEVENT_OUT) {
 		/* nothing to do */
 	}
-
+	
 	/* perhaps this issue is already handled */
 	if (revents & FDEVENT_HUP) {
 		/* check if we still have a unfinished header package which is a body in reality */
@@ -623,54 +623,54 @@ static handler_t cgi_handle_fdevent(void *s, void *ctx, int revents) {
 			http_chunk_append_mem(srv, con, hctx->response_header->ptr, hctx->response_header->used);
 			joblist_append(srv, con);
 		}
-
+		
 		if (con->file_finished == 0) {
 			http_chunk_append_mem(srv, con, NULL, 0);
 			joblist_append(srv, con);
 		}
-
+		
 		con->file_finished = 1;
-
+		
 		if (chunkqueue_is_empty(con->write_queue)) {
 			/* there is nothing left to write */
 			connection_set_state(srv, con, CON_STATE_RESPONSE_END);
 		} else {
 			/* used the write-handler to finish the request on demand */
-
+			
 		}
-
+		
 # if 0
 		log_error_write(srv, __FILE__, __LINE__, "sddd", "got HUP from cgi", con->fd, hctx->fd, revents);
 # endif
-
+		
 		/* rtsigs didn't liked the close */
 		cgi_connection_close(srv, hctx);
 	} else if (revents & FDEVENT_ERR) {
 		con->file_finished = 1;
-
+		
 		/* kill all connections to the cgi process */
 		cgi_connection_close(srv, hctx);
 #if 1
 		log_error_write(srv, __FILE__, __LINE__, "s", "cgi-FDEVENT_ERR");
-#endif
+#endif			
 		return HANDLER_ERROR;
 	}
-
+	
 	return HANDLER_FINISHED;
 }
 
 
 static int cgi_env_add(char_array *env, const char *key, size_t key_len, const char *val, size_t val_len) {
 	char *dst;
-
+	
 	if (!key || !val) return -1;
-
+	
 	dst = malloc(key_len + val_len + 3);
 	memcpy(dst, key, key_len);
 	dst[key_len] = '=';
 	/* add the \0 from the value */
 	memcpy(dst + key_len + 1, val, val_len + 1);
-
+	
 	if (env->size == 0) {
 		env->size = 16;
 		env->ptr = malloc(env->size * sizeof(*env->ptr));
@@ -678,45 +678,45 @@ static int cgi_env_add(char_array *env, const char *key, size_t key_len, const c
 		env->size += 16;
 		env->ptr = realloc(env->ptr, env->size * sizeof(*env->ptr));
 	}
-
+	
 	env->ptr[env->used++] = dst;
-
+	
 	return 0;
 }
 
 static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *cgi_handler) {
 	pid_t pid;
-
+	
 #ifdef HAVE_IPV6
 	char b2[INET6_ADDRSTRLEN + 1];
 #endif
-
+	
 	int to_cgi_fds[2];
 	int from_cgi_fds[2];
 	struct stat st;
-
-#ifndef __WIN32
-
+	
+#ifndef __WIN32	
+	
 	if (cgi_handler->used > 1) {
 		/* stat the exec file */
 		if (-1 == (stat(cgi_handler->ptr, &st))) {
-			log_error_write(srv, __FILE__, __LINE__, "sbss",
+			log_error_write(srv, __FILE__, __LINE__, "sbss", 
 					"stat for cgi-handler", cgi_handler,
 					"failed:", strerror(errno));
 			return -1;
 		}
 	}
-
+	
 	if (pipe(to_cgi_fds)) {
 		log_error_write(srv, __FILE__, __LINE__, "ss", "pipe failed:", strerror(errno));
 		return -1;
 	}
-
+	
 	if (pipe(from_cgi_fds)) {
 		log_error_write(srv, __FILE__, __LINE__, "ss", "pipe failed:", strerror(errno));
 		return -1;
 	}
-
+	
 	/* fork, execve */
 	switch (pid = fork()) {
 	case 0: {
@@ -730,22 +730,22 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 		char *c;
 		const char *s;
 		server_socket *srv_sock = con->srv_socket;
-
+		
 		/* move stdout to from_cgi_fd[1] */
 		close(STDOUT_FILENO);
 		dup2(from_cgi_fds[1], STDOUT_FILENO);
 		close(from_cgi_fds[1]);
 		/* not needed */
 		close(from_cgi_fds[0]);
-
+		
 		/* move the stdin to to_cgi_fd[0] */
 		close(STDIN_FILENO);
 		dup2(to_cgi_fds[0], STDIN_FILENO);
 		close(to_cgi_fds[0]);
 		/* not needed */
 		close(to_cgi_fds[1]);
-
-		/* HACK:
+		
+		/* HACK: 
 		 * this is not nice, but it works
 		 *
 		 * we feed the stderr of the CGI to our errorlog, if possible
@@ -754,20 +754,20 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 			close(STDERR_FILENO);
 			dup2(srv->errorlog_fd, STDERR_FILENO);
 		}
-
+		
 		/* create environment */
 		env.ptr = NULL;
 		env.size = 0;
 		env.used = 0;
-
+		
 		cgi_env_add(&env, CONST_STR_LEN("SERVER_SOFTWARE"), CONST_STR_LEN(PACKAGE_NAME"/"PACKAGE_VERSION));
 
 		if (!buffer_is_empty(con->server_name)) {
 			cgi_env_add(&env, CONST_STR_LEN("SERVER_NAME"), CONST_BUF_LEN(con->server_name));
 		} else {
 #ifdef HAVE_IPV6
-			s = inet_ntop(srv_sock->addr.plain.sa_family,
-				      srv_sock->addr.plain.sa_family == AF_INET6 ?
+			s = inet_ntop(srv_sock->addr.plain.sa_family, 
+				      srv_sock->addr.plain.sa_family == AF_INET6 ? 
 				      (const void *) &(srv_sock->addr.ipv6.sin6_addr) :
 				      (const void *) &(srv_sock->addr.ipv4.sin_addr),
 				      b2, sizeof(b2)-1);
@@ -779,10 +779,10 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 		cgi_env_add(&env, CONST_STR_LEN("GATEWAY_INTERFACE"), CONST_STR_LEN("CGI/1.1"));
 
 		s = get_http_version_name(con->request.http_version);
-
+		
 		cgi_env_add(&env, CONST_STR_LEN("SERVER_PROTOCOL"), s, strlen(s));
-
-		ltostr(buf,
+		
+		ltostr(buf, 
 #ifdef HAVE_IPV6
 			ntohs(srv_sock->addr.plain.sa_family == AF_INET6 ? srv_sock->addr.ipv6.sin6_port : srv_sock->addr.ipv4.sin_port)
 #else
@@ -790,10 +790,10 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 #endif
 			);
 		cgi_env_add(&env, CONST_STR_LEN("SERVER_PORT"), buf, strlen(buf));
-
+		
 #ifdef HAVE_IPV6
-		s = inet_ntop(srv_sock->addr.plain.sa_family,
-			      srv_sock->addr.plain.sa_family == AF_INET6 ?
+		s = inet_ntop(srv_sock->addr.plain.sa_family, 
+			      srv_sock->addr.plain.sa_family == AF_INET6 ? 
 			      (const void *) &(srv_sock->addr.ipv6.sin6_addr) :
 			      (const void *) &(srv_sock->addr.ipv4.sin_addr),
 			      b2, sizeof(b2)-1);
@@ -815,11 +815,11 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 		if (!buffer_is_empty(con->request.orig_uri)) {
 			cgi_env_add(&env, CONST_STR_LEN("REQUEST_URI"), CONST_BUF_LEN(con->request.orig_uri));
 		}
-
-
+		
+		
 #ifdef HAVE_IPV6
-		s = inet_ntop(con->dst_addr.plain.sa_family,
-			      con->dst_addr.plain.sa_family == AF_INET6 ?
+		s = inet_ntop(con->dst_addr.plain.sa_family, 
+			      con->dst_addr.plain.sa_family == AF_INET6 ? 
 			      (const void *) &(con->dst_addr.ipv6.sin6_addr) :
 			      (const void *) &(con->dst_addr.ipv4.sin_addr),
 			      b2, sizeof(b2)-1);
@@ -828,7 +828,7 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 #endif
 		cgi_env_add(&env, CONST_STR_LEN("REMOTE_ADDR"), s, strlen(s));
 
-		ltostr(buf,
+		ltostr(buf, 
 #ifdef HAVE_IPV6
 			ntohs(con->dst_addr.plain.sa_family == AF_INET6 ? con->dst_addr.ipv6.sin6_port : con->dst_addr.ipv4.sin_port)
 #else
@@ -836,19 +836,19 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 #endif
 			);
 		cgi_env_add(&env, CONST_STR_LEN("REMOTE_PORT"), buf, strlen(buf));
-
+		
 		if (!buffer_is_empty(con->authed_user)) {
 			cgi_env_add(&env, CONST_STR_LEN("REMOTE_USER"),
 				    CONST_BUF_LEN(con->authed_user));
 		}
-
+		
 		/* request.content_length < SSIZE_MAX, see request.c */
 		ltostr(buf, con->request.content_length);
 		cgi_env_add(&env, CONST_STR_LEN("CONTENT_LENGTH"), buf, strlen(buf));
 		cgi_env_add(&env, CONST_STR_LEN("SCRIPT_FILENAME"), CONST_BUF_LEN(con->physical.path));
 		cgi_env_add(&env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path));
 		cgi_env_add(&env, CONST_STR_LEN("DOCUMENT_ROOT"), CONST_BUF_LEN(con->physical.doc_root));
-
+		
 		/* for valgrind */
 		if (NULL != (s = getenv("LD_PRELOAD"))) {
 			cgi_env_add(&env, CONST_STR_LEN("LD_PRELOAD"), s, strlen(s));
@@ -863,24 +863,24 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 			cgi_env_add(&env, CONST_STR_LEN("SYSTEMROOT"), s, strlen(s));
 		}
 #endif
-
+		
 		for (n = 0; n < con->request.headers->used; n++) {
 			data_string *ds;
-
+			
 			ds = (data_string *)con->request.headers->data[n];
-
+			
 			if (ds->value->used && ds->key->used) {
 				size_t j;
-
+				
 				buffer_reset(p->tmp_buf);
-
+				
 				if (0 != strcasecmp(ds->key->ptr, "CONTENT-TYPE")) {
 					buffer_copy_string(p->tmp_buf, "HTTP_");
 					p->tmp_buf->used--; /* strip \0 after HTTP_ */
 				}
-
+				
 				buffer_prepare_append(p->tmp_buf, ds->key->used + 2);
-
+				
 				for (j = 0; j < ds->key->used - 1; j++) {
 					char cr = '_';
 					if (light_isalpha(ds->key->ptr[j])) {
@@ -893,46 +893,46 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 					p->tmp_buf->ptr[p->tmp_buf->used++] = cr;
 				}
 				p->tmp_buf->ptr[p->tmp_buf->used++] = '\0';
-
+				
 				cgi_env_add(&env, CONST_BUF_LEN(p->tmp_buf), CONST_BUF_LEN(ds->value));
 			}
 		}
-
+		
 		for (n = 0; n < con->environment->used; n++) {
 			data_string *ds;
-
+			
 			ds = (data_string *)con->environment->data[n];
-
+			
 			if (ds->value->used && ds->key->used) {
 				size_t j;
-
+				
 				buffer_reset(p->tmp_buf);
-
+				
 				buffer_prepare_append(p->tmp_buf, ds->key->used + 2);
-
+				
 				for (j = 0; j < ds->key->used - 1; j++) {
-					p->tmp_buf->ptr[p->tmp_buf->used++] =
-						isalpha((unsigned char)ds->key->ptr[j]) ?
+					p->tmp_buf->ptr[p->tmp_buf->used++] = 
+						isalpha((unsigned char)ds->key->ptr[j]) ? 
 						toupper((unsigned char)ds->key->ptr[j]) : '_';
 				}
 				p->tmp_buf->ptr[p->tmp_buf->used++] = '\0';
-
+				
 				cgi_env_add(&env, CONST_BUF_LEN(p->tmp_buf), CONST_BUF_LEN(ds->value));
 			}
 		}
-
+		
 		if (env.size == env.used) {
 			env.size += 16;
 			env.ptr = realloc(env.ptr, env.size * sizeof(*env.ptr));
 		}
-
+		
 		env.ptr[env.used] = NULL;
-
+		
 		/* set up args */
 		argc = 3;
 		args = malloc(sizeof(*args) * argc);
 		i = 0;
-
+		
 		if (cgi_handler->used > 1) {
 			args[i++] = cgi_handler->ptr;
 		}
@@ -942,7 +942,7 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 		/* search for the last / */
 		if (NULL != (c = strrchr(con->physical.path->ptr, '/'))) {
 			*c = '\0';
-
+			
 			/* change to the physical directory */
 			if (-1 == chdir(con->physical.path->ptr)) {
 				log_error_write(srv, __FILE__, __LINE__, "ssb", "chdir failed:", strerror(errno), con->physical.path);
@@ -954,12 +954,12 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 		for (i = 3; i < 256; i++) {
 			if (i != srv->errorlog_fd) close(i);
 		}
-
+		
 		/* exec the cgi */
 		execve(args[0], args, env.ptr);
-
+		
 		log_error_write(srv, __FILE__, __LINE__, "sss", "CGI failed:", strerror(errno), args[0]);
-
+		
 		/* */
 		SEGFAULT();
 		break;
@@ -974,11 +974,11 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 
 		close(from_cgi_fds[1]);
 		close(to_cgi_fds[0]);
-
+		
 		if (con->request.content_length) {
 			chunkqueue *cq = con->request_content_queue;
 			chunk *c;
-
+		
 			assert(chunkqueue_length(cq) == (off_t)con->request.content_length);
 
 			/* there is content to send */
@@ -993,16 +993,16 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 						if (-1 == c->file.fd &&  /* open the file if not already open */
 						    -1 == (c->file.fd = open(c->file.name->ptr, O_RDONLY))) {
 							log_error_write(srv, __FILE__, __LINE__, "ss", "open failed: ", strerror(errno));
-
+					
 							close(from_cgi_fds[0]);
 							close(to_cgi_fds[1]);
 							return -1;
 						}
 
 						c->file.mmap.length = c->file.length;
-
+				
 						if (MAP_FAILED == (c->file.mmap.start = mmap(0,  c->file.mmap.length, PROT_READ, MAP_SHARED, c->file.fd, 0))) {
-							log_error_write(srv, __FILE__, __LINE__, "ssbd", "mmap failed: ",
+							log_error_write(srv, __FILE__, __LINE__, "ssbd", "mmap failed: ", 
 									strerror(errno), c->file.name,  c->file.fd);
 
 							close(from_cgi_fds[0]);
@@ -1012,7 +1012,7 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 
 						close(c->file.fd);
 						c->file.fd = -1;
-
+	
 						/* chunk_reset() or chunk_free() will cleanup for us */
 					}
 
@@ -1020,7 +1020,7 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 						switch(errno) {
 						case ENOSPC:
 							con->http_status = 507;
-
+		
 							break;
 						default:
 							con->http_status = 403;
@@ -1033,7 +1033,7 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 						switch(errno) {
 						case ENOSPC:
 							con->http_status = 507;
-
+		
 							break;
 						default:
 							con->http_status = 403;
@@ -1056,45 +1056,45 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 		}
 
 		close(to_cgi_fds[1]);
-
+				
 		/* register PID and wait for them asyncronously */
 		con->mode = p->id;
 		buffer_reset(con->physical.path);
-
+		
 		hctx = cgi_handler_ctx_init();
-
+		
 		hctx->remote_conn = con;
 		hctx->plugin_data = p;
 		hctx->pid = pid;
 		hctx->fd = from_cgi_fds[0];
 		hctx->fde_ndx = -1;
-
+		
 		con->plugin_ctx[p->id] = hctx;
-
+		
 		fdevent_register(srv->ev, hctx->fd, cgi_handle_fdevent, hctx);
 		fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
-
+		
 		if (-1 == fdevent_fcntl_set(srv->ev, hctx->fd)) {
 			log_error_write(srv, __FILE__, __LINE__, "ss", "fcntl failed: ", strerror(errno));
-
+			
 			fdevent_event_del(srv->ev, &(hctx->fde_ndx), hctx->fd);
 			fdevent_unregister(srv->ev, hctx->fd);
-
+			
 			log_error_write(srv, __FILE__, __LINE__, "sd", "cgi close:", hctx->fd);
-
+			
 			close(hctx->fd);
-
+			
 			cgi_handler_ctx_free(hctx);
-
+			
 			con->plugin_ctx[p->id] = NULL;
-
+			
 			return -1;
 		}
-
+		
 		break;
 	}
 	}
-
+	
 	return 0;
 #else
 	return -1;
@@ -1106,27 +1106,27 @@ static int cgi_create_env(server *srv, connection *con, plugin_data *p, buffer *
 static int mod_cgi_patch_connection(server *srv, connection *con, plugin_data *p) {
 	size_t i, j;
 	plugin_config *s = p->config_storage[0];
-
+	
 	PATCH(cgi);
-
+	
 	/* 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("cgi.assign"))) {
 				PATCH(cgi);
 			}
 		}
 	}
-
+	
 	return 0;
 }
 #undef PATCH
@@ -1135,24 +1135,24 @@ URIHANDLER_FUNC(cgi_is_handled) {
 	size_t k, s_len;
 	plugin_data *p = p_d;
 	buffer *fn = con->physical.path;
-
+	
 	if (fn->used == 0) return HANDLER_GO_ON;
-
+	
 	mod_cgi_patch_connection(srv, con, p);
-
+	
 	s_len = fn->used - 1;
-
+	
 	for (k = 0; k < p->conf.cgi->used; k++) {
 		data_string *ds = (data_string *)p->conf.cgi->data[k];
 		size_t ct_len = ds->key->used - 1;
-
+		
 		if (ds->key->used == 0) continue;
 		if (s_len < ct_len) continue;
-
+		
 		if (0 == strncmp(fn->ptr + s_len - ct_len, ds->key->ptr, ct_len)) {
 			if (cgi_create_env(srv, con, p, ds->value)) {
 				con->http_status = 500;
-
+				
 				buffer_reset(con->physical.path);
 				return HANDLER_FINISHED;
 			}
@@ -1160,7 +1160,7 @@ URIHANDLER_FUNC(cgi_is_handled) {
 			break;
 		}
 	}
-
+	
 	return HANDLER_GO_ON;
 }
 
@@ -1172,7 +1172,7 @@ TRIGGER_FUNC(cgi_trigger) {
 
 	for (ndx = 0; ndx < p->cgi_pid.used; ndx++) {
 		int status;
-
+		
 		switch(waitpid(p->cgi_pid.ptr[ndx], &status, WNOHANG)) {
 		case 0:
 			/* not finished yet */
@@ -1182,7 +1182,7 @@ TRIGGER_FUNC(cgi_trigger) {
 			break;
 		case -1:
 			log_error_write(srv, __FILE__, __LINE__, "ss", "waitpid failed: ", strerror(errno));
-
+			
 			return HANDLER_ERROR;
 		default:
 
@@ -1193,16 +1193,16 @@ TRIGGER_FUNC(cgi_trigger) {
 			} else {
 				log_error_write(srv, __FILE__, __LINE__, "s", "cgi died ?");
 			}
-
+			
 			cgi_pid_del(srv, p, p->cgi_pid.ptr[ndx]);
-			/* del modified the buffer structure
+			/* del modified the buffer structure 
 			 * and copies the last entry to the current one
 			 * -> recheck the current index
 			 */
 			ndx--;
 		}
 	}
-#endif
+#endif	
 	return HANDLER_GO_ON;
 }
 
@@ -1210,15 +1210,15 @@ SUBREQUEST_FUNC(mod_cgi_handle_subrequest) {
 	int status;
 	plugin_data *p = p_d;
 	handler_ctx *hctx = con->plugin_ctx[p->id];
-
+	
 	if (con->mode != p->id) return HANDLER_GO_ON;
 	if (NULL == hctx) return HANDLER_GO_ON;
-
+	
 #if 0
 	log_error_write(srv, __FILE__, __LINE__, "sdd", "subrequest, pid =", hctx, hctx->pid);
-#endif
+#endif	
 	if (hctx->pid == 0) return HANDLER_FINISHED;
-#ifndef __WIN32
+#ifndef __WIN32	
 	switch(waitpid(hctx->pid, &status, WNOHANG)) {
 	case 0:
 		/* we only have for events here if we don't have the header yet,
@@ -1228,61 +1228,61 @@ SUBREQUEST_FUNC(mod_cgi_handle_subrequest) {
 		return HANDLER_WAIT_FOR_EVENT;
 	case -1:
 		if (errno == EINTR) return HANDLER_WAIT_FOR_EVENT;
-
+		
 		if (errno == ECHILD && con->file_started == 0) {
 			/*
-			 * second round but still not response
+			 * second round but still not response 
 			 */
-			return HANDLER_WAIT_FOR_EVENT;
+			return HANDLER_WAIT_FOR_EVENT; 
 		}
-
+		
 		log_error_write(srv, __FILE__, __LINE__, "ss", "waitpid failed: ", strerror(errno));
 		con->mode = DIRECT;
 		con->http_status = 500;
-
+		
 		hctx->pid = 0;
-
+		
 		fdevent_event_del(srv->ev, &(hctx->fde_ndx), hctx->fd);
 		fdevent_unregister(srv->ev, hctx->fd);
-
+		
 		if (close(hctx->fd)) {
 			log_error_write(srv, __FILE__, __LINE__, "sds", "cgi close failed ", hctx->fd, strerror(errno));
 		}
-
+		
 		cgi_handler_ctx_free(hctx);
-
+		
 		con->plugin_ctx[p->id] = NULL;
-
+		
 		return HANDLER_FINISHED;
 	default:
-		/* cgi process exited cleanly
-		 *
-		 * check if we already got the response
+		/* cgi process exited cleanly 
+		 * 
+		 * check if we already got the response 
 		 */
-
+		
 		if (!con->file_started) return HANDLER_WAIT_FOR_EVENT;
-
+		
 		if (WIFEXITED(status)) {
 			/* nothing */
 		} else {
 			log_error_write(srv, __FILE__, __LINE__, "s", "cgi died ?");
-
+			
 			con->mode = DIRECT;
 			con->http_status = 500;
-
+			
 		}
-
+		
 		hctx->pid = 0;
-
+		
 		fdevent_event_del(srv->ev, &(hctx->fde_ndx), hctx->fd);
 		fdevent_unregister(srv->ev, hctx->fd);
-
+		
 		if (close(hctx->fd)) {
 			log_error_write(srv, __FILE__, __LINE__, "sds", "cgi close failed ", hctx->fd, strerror(errno));
 		}
-
+		
 		cgi_handler_ctx_free(hctx);
-
+		
 		con->plugin_ctx[p->id] = NULL;
 		return HANDLER_FINISHED;
 	}
@@ -1306,8 +1306,8 @@ int mod_cgi_plugin_init(plugin *p) {
 	p->init           = mod_cgi_init;
 	p->cleanup        = mod_cgi_free;
 	p->set_defaults   = mod_fastcgi_set_defaults;
-
+	
 	p->data        = NULL;
-
+	
 	return 0;
 }