--- embedaddon/lighttpd/src/mod_compress.c	2013/10/14 10:32:47	1.1
+++ embedaddon/lighttpd/src/mod_compress.c	2014/06/15 20:20:06	1.1.1.2
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <assert.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -161,7 +162,7 @@ SETDEFAULTS_FUNC(mod_compress_setdefaults) {
 		{ NULL,                             NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
 	};
 
-	p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *));
+	p->config_storage = calloc(1, srv->config_context->used * sizeof(plugin_config *));
 
 	for (i = 0; i < srv->config_context->used; i++) {
 		plugin_config *s;
@@ -412,7 +413,7 @@ static int deflate_file_to_buffer_bzip2(server *srv, c
 
 static int deflate_file_to_file(server *srv, connection *con, plugin_data *p, buffer *fn, stat_cache_entry *sce, int type) {
 	int ifd, ofd;
-	int ret = -1;
+	int ret;
 	void *start;
 	const char *filename = fn->ptr;
 	ssize_t r;
@@ -525,6 +526,7 @@ static int deflate_file_to_file(server *srv, connectio
 	}
 #endif
 
+	ret = -1;
 	switch(type) {
 #ifdef USE_ZLIB
 	case HTTP_ACCEPT_ENCODING_GZIP:
@@ -541,9 +543,6 @@ static int deflate_file_to_file(server *srv, connectio
 		ret = deflate_file_to_buffer_bzip2(srv, con, p, start, sce->st.st_size);
 		break;
 #endif
-	default:
-		ret = -1;
-		break;
 	}
 
 	if (ret == 0) {
@@ -860,7 +859,8 @@ PHYSICALPATH_FUNC(mod_compress_physical) {
 					} else if (matched_encodings & HTTP_ACCEPT_ENCODING_X_GZIP) {
 						compression_type = HTTP_ACCEPT_ENCODING_X_GZIP;
 						compression_name = dflt_x_gzip;
-					} else if (matched_encodings & HTTP_ACCEPT_ENCODING_DEFLATE) {
+					} else {
+						force_assert(matched_encodings & HTTP_ACCEPT_ENCODING_DEFLATE);
 						compression_type = HTTP_ACCEPT_ENCODING_DEFLATE;
 						compression_name = dflt_deflate;
 					}