SOURCES: lighttpd-mod_compress-disable-bzip2.patch - missing buffer_init() ...

glen glen at pld-linux.org
Fri Sep 19 15:22:57 CEST 2008


Author: glen                         Date: Fri Sep 19 13:22:57 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- missing buffer_init() for p->encodings_arr

---- Files affected:
SOURCES:
   lighttpd-mod_compress-disable-bzip2.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/lighttpd-mod_compress-disable-bzip2.patch
diff -u SOURCES/lighttpd-mod_compress-disable-bzip2.patch:1.5 SOURCES/lighttpd-mod_compress-disable-bzip2.patch:1.6
--- SOURCES/lighttpd-mod_compress-disable-bzip2.patch:1.5	Fri Sep 19 14:48:35 2008
+++ SOURCES/lighttpd-mod_compress-disable-bzip2.patch	Fri Sep 19 15:22:51 2008
@@ -1,4 +1,4 @@
---- lighttpd-1.4.19/src/mod_compress.c	2008-09-19 13:24:30.921429633 +0300
+--- lighttpd-1.4.19/src/mod_compress.c	2008-09-19 14:16:06.292324544 +0300
 +++ lighttpd-1.4.19/src/mod_compress.c	2008-09-19 14:16:06.292324544 +0300
 @@ -49,12 +49,14 @@
  	buffer *compress_cache_dir;
@@ -15,7 +15,15 @@
  
  	plugin_config **config_storage;
  	plugin_config conf;
-@@ -154,6 +156,7 @@
+@@ -67,6 +69,7 @@
+ 
+ 	p->ofn = buffer_init();
+ 	p->b = buffer_init();
++	p->encodings_arr = array_init();
+ 
+ 	return p;
+ }
+@@ -154,6 +157,7 @@
  		{ "compress.cache-dir",             NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
  		{ "compress.filetype",              NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION },
  		{ "compress.max-filesize",          NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },
@@ -23,7 +31,7 @@
  		{ NULL,                             NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
  	};
  
-@@ -166,10 +169,12 @@
+@@ -166,10 +170,12 @@
  		s->compress_cache_dir = buffer_init();
  		s->compress = array_init();
  		s->compress_max_filesize = 0;
@@ -36,7 +44,7 @@
  
  		p->config_storage[i] = s;
  
-@@ -177,6 +182,32 @@
+@@ -177,6 +183,32 @@
  			return HANDLER_ERROR;
  		}
  
@@ -69,7 +77,7 @@
  		if (!buffer_is_empty(s->compress_cache_dir)) {
  			struct stat st;
  			mkdir_recursive(s->compress_cache_dir->ptr);
-@@ -587,6 +618,7 @@
+@@ -587,6 +619,7 @@
  	PATCH(compress_cache_dir);
  	PATCH(compress);
  	PATCH(compress_max_filesize);
@@ -77,7 +85,7 @@
  
  	/* skip the first, the global context */
  	for (i = 1; i < srv->config_context->used; i++) {
-@@ -606,6 +638,8 @@
+@@ -606,6 +639,8 @@
  				PATCH(compress);
  			} else if (buffer_is_equal_string(du->key, CONST_STR_LEN("compress.max-filesize"))) {
  				PATCH(compress_max_filesize);
@@ -86,7 +94,7 @@
  			}
  		}
  	}
-@@ -668,27 +702,19 @@
+@@ -668,27 +703,19 @@
  			if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "Accept-Encoding"))) {
  				int accept_encoding = 0;
  				char *value = ds->value->ptr;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/lighttpd-mod_compress-disable-bzip2.patch?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list