Imported Upstream version 1.4.13~r1370upstream/1.4.13_r1370

1 files changed, 55 insertions, 55 deletions

diff --git a/src/mod_simple_vhost.c b/src/mod_simple_vhost.c
index d55cfed..8f81384 100644
--- a/src/mod_simple_vhost.c
+++ b/src/mod_simple_vhost.c
@@ -18,7 +18,7 @@ typedef struct {
 	buffer *server_root;
 	buffer *default_host;
 	buffer *document_root;
-
+	
 	buffer *docroot_cache_key;
 	buffer *docroot_cache_value;
 	buffer *docroot_cache_servername;
@@ -28,119 +28,119 @@ typedef struct {
 
 typedef struct {
 	PLUGIN_DATA;
-
+	
 	buffer *doc_root;
-
+	
 	plugin_config **config_storage;
-	plugin_config conf;
+	plugin_config conf; 
 } plugin_data;
 
 INIT_FUNC(mod_simple_vhost_init) {
 	plugin_data *p;
-
+	
 	p = calloc(1, sizeof(*p));
-
+	
 	p->doc_root = buffer_init();
-
+	
 	return p;
 }
 
 FREE_FUNC(mod_simple_vhost_free) {
 	plugin_data *p = p_d;
-
+	
 	UNUSED(srv);
 
 	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];
-
+			
 			buffer_free(s->document_root);
 			buffer_free(s->default_host);
 			buffer_free(s->server_root);
-
+			
 			buffer_free(s->docroot_cache_key);
 			buffer_free(s->docroot_cache_value);
 			buffer_free(s->docroot_cache_servername);
-
+			
 			free(s);
 		}
-
+	
 		free(p->config_storage);
 	}
-
+	
 	buffer_free(p->doc_root);
-
+	
 	free(p);
-
+	
 	return HANDLER_GO_ON;
 }
 
 SETDEFAULTS_FUNC(mod_simple_vhost_set_defaults) {
 	plugin_data *p = p_d;
 	size_t i;
-
-	config_values_t cv[] = {
+	
+	config_values_t cv[] = { 
 		{ "simple-vhost.server-root",       NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
 		{ "simple-vhost.default-host",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
 		{ "simple-vhost.document-root",     NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
 		{ "simple-vhost.debug",             NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },
 		{ 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->server_root = buffer_init();
 		s->default_host = buffer_init();
 		s->document_root = buffer_init();
-
+		
 		s->docroot_cache_key = buffer_init();
 		s->docroot_cache_value = buffer_init();
 		s->docroot_cache_servername = buffer_init();
 
 		s->debug = 0;
-
+		
 		cv[0].destination = s->server_root;
 		cv[1].destination = s->default_host;
 		cv[2].destination = s->document_root;
 		cv[3].destination = &(s->debug);
-
-
+		
+		
 		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;
 }
 
 static int build_doc_root(server *srv, connection *con, plugin_data *p, buffer *out, buffer *host) {
 	stat_cache_entry *sce = NULL;
-
+	
 	buffer_prepare_copy(out, 128);
 
 	if (p->conf.server_root->used) {
 		buffer_copy_string_buffer(out, p->conf.server_root);
-
+		
 		if (host->used) {
 			/* a hostname has to start with a alpha-numerical character
 			 * and must not contain a slash "/"
 			 */
 			char *dp;
-
+			
 			BUFFER_APPEND_SLASH(out);
-
+			
 			if (NULL == (dp = strchr(host->ptr, ':'))) {
 				buffer_append_string_buffer(out, host);
 			} else {
@@ -148,7 +148,7 @@ static int build_doc_root(server *srv, connection *con, plugin_data *p, buffer *
 			}
 		}
 		BUFFER_APPEND_SLASH(out);
-
+		
 		if (p->conf.document_root->used > 2 && p->conf.document_root->ptr[0] == '/') {
 			buffer_append_string_len(out, p->conf.document_root->ptr + 1, p->conf.document_root->used - 2);
 		} else {
@@ -159,7 +159,7 @@ static int build_doc_root(server *srv, connection *con, plugin_data *p, buffer *
 		buffer_copy_string_buffer(out, con->conf.document_root);
 		BUFFER_APPEND_SLASH(out);
 	}
-
+	
 	if (HANDLER_ERROR == stat_cache_get_entry(srv, con, out, &sce)) {
 		if (p->conf.debug) {
 			log_error_write(srv, __FILE__, __LINE__, "sb",
@@ -169,7 +169,7 @@ static int build_doc_root(server *srv, connection *con, plugin_data *p, buffer *
 	} else if (!S_ISDIR(sce->st.st_mode)) {
 		return -1;
 	}
-
+	
 	return 0;
 }
 
@@ -179,29 +179,29 @@ static int build_doc_root(server *srv, connection *con, plugin_data *p, buffer *
 static int mod_simple_vhost_patch_connection(server *srv, connection *con, plugin_data *p) {
 	size_t i, j;
 	plugin_config *s = p->config_storage[0];
-
+	
 	PATCH(server_root);
 	PATCH(default_host);
 	PATCH(document_root);
-
+	
 	PATCH(docroot_cache_key);
 	PATCH(docroot_cache_value);
 	PATCH(docroot_cache_servername);
 
 	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];
 		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("simple-vhost.server-root"))) {
 				PATCH(server_root);
 				PATCH(docroot_cache_key);
@@ -216,7 +216,7 @@ static int mod_simple_vhost_patch_connection(server *srv, connection *con, plugi
 			}
 		}
 	}
-
+	
 	return 0;
 }
 #undef PATCH
@@ -227,12 +227,12 @@ static handler_t mod_simple_vhost_docroot(server *srv, connection *con, void *p_
 	/*
 	 * cache the last successfull translation from hostname (authority) to docroot
 	 * - this saves us a stat() call
-	 *
+	 * 
 	 */
-
+	
 	mod_simple_vhost_patch_connection(srv, con, p);
-
-	if (p->conf.docroot_cache_key->used &&
+	
+	if (p->conf.docroot_cache_key->used && 
 	    con->uri.authority->used &&
 	    buffer_is_equal(p->conf.docroot_cache_key, con->uri.authority)) {
 		/* cache hit */
@@ -243,8 +243,8 @@ static handler_t mod_simple_vhost_docroot(server *srv, connection *con, void *p_
 		if ((con->uri.authority->used == 0) ||
 		    build_doc_root(srv, con, p, p->doc_root, con->uri.authority)) {
 			/* not found, fallback the default-host */
-			if (build_doc_root(srv, con, p,
-					   p->doc_root,
+			if (build_doc_root(srv, con, p, 
+					   p->doc_root, 
 					   p->conf.default_host)) {
 				return HANDLER_GO_ON;
 			} else {
@@ -253,15 +253,15 @@ static handler_t mod_simple_vhost_docroot(server *srv, connection *con, void *p_
 		} else {
 			buffer_copy_string_buffer(con->server_name, con->uri.authority);
 		}
-
+		
 		/* copy to cache */
 		buffer_copy_string_buffer(p->conf.docroot_cache_key,        con->uri.authority);
 		buffer_copy_string_buffer(p->conf.docroot_cache_value,      p->doc_root);
 		buffer_copy_string_buffer(p->conf.docroot_cache_servername, con->server_name);
-
+		
 		buffer_copy_string_buffer(con->physical.doc_root, p->doc_root);
 	}
-
+	
 	return HANDLER_GO_ON;
 }
 
@@ -269,13 +269,13 @@ static handler_t mod_simple_vhost_docroot(server *srv, connection *con, void *p_
 int mod_simple_vhost_plugin_init(plugin *p) {
 	p->version     = LIGHTTPD_VERSION_ID;
 	p->name        = buffer_init_string("simple_vhost");
-
+	
 	p->init        = mod_simple_vhost_init;
 	p->set_defaults = mod_simple_vhost_set_defaults;
 	p->handle_docroot  = mod_simple_vhost_docroot;
 	p->cleanup     = mod_simple_vhost_free;
-
+	
 	p->data        = NULL;
-
+	
 	return 0;
 }