aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/https/tls/gnutls_compress_int.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon/https/tls/gnutls_compress_int.c')
-rw-r--r--src/daemon/https/tls/gnutls_compress_int.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/daemon/https/tls/gnutls_compress_int.c b/src/daemon/https/tls/gnutls_compress_int.c
index 07ffd5e1..2006f8e6 100644
--- a/src/daemon/https/tls/gnutls_compress_int.c
+++ b/src/daemon/https/tls/gnutls_compress_int.c
@@ -52,7 +52,7 @@ MHD_gtls_comp_init (enum MHD_GNUTLS_CompressionMethod method, int d)
52 { 52 {
53 int window_bits, mem_level; 53 int window_bits, mem_level;
54 int comp_level; 54 int comp_level;
55 int err; 55 int err;
56 z_stream *zhandle; 56 z_stream *zhandle;
57 57
58 window_bits = MHD_gtls_compression_get_wbits (method); 58 window_bits = MHD_gtls_compression_get_wbits (method);
@@ -74,10 +74,10 @@ MHD_gtls_comp_init (enum MHD_GNUTLS_CompressionMethod method, int d)
74 74
75 if (d) 75 if (d)
76 err = inflateInit2 (zhandle, window_bits); 76 err = inflateInit2 (zhandle, window_bits);
77 else 77 else
78 err = deflateInit2 (zhandle, 78 err = deflateInit2 (zhandle,
79 comp_level, Z_DEFLATED, 79 comp_level, Z_DEFLATED,
80 window_bits, mem_level, Z_DEFAULT_STRATEGY); 80 window_bits, mem_level, Z_DEFAULT_STRATEGY);
81 if (err != Z_OK) 81 if (err != Z_OK)
82 { 82 {
83 MHD_gnutls_assert (); 83 MHD_gnutls_assert ();
@@ -111,7 +111,7 @@ MHD_gtls_comp_deinit (comp_hd_t handle, int d)
111 switch (handle->algo) 111 switch (handle->algo)
112 { 112 {
113#ifdef HAVE_LIBZ 113#ifdef HAVE_LIBZ
114 int err; 114 int err;
115 case MHD_GNUTLS_COMP_DEFLATE: 115 case MHD_GNUTLS_COMP_DEFLATE:
116 if (d) 116 if (d)
117 err = inflateEnd (handle->handle); 117 err = inflateEnd (handle->handle);
@@ -154,7 +154,7 @@ MHD_gtls_compress (comp_hd_t handle, const opaque * plain,
154 { 154 {
155 uLongf size; 155 uLongf size;
156 z_stream *zhandle; 156 z_stream *zhandle;
157 int err; 157 int err;
158 158
159 size = (plain_size + plain_size) + 10; 159 size = (plain_size + plain_size) + 10;
160 *compressed = MHD_gnutls_malloc (size); 160 *compressed = MHD_gnutls_malloc (size);
@@ -192,7 +192,8 @@ MHD_gtls_compress (comp_hd_t handle, const opaque * plain,
192 192
193#ifdef COMPRESSION_DEBUG 193#ifdef COMPRESSION_DEBUG
194 MHD__gnutls_debug_log ("Compression ratio: %f\n", 194 MHD__gnutls_debug_log ("Compression ratio: %f\n",
195 (float) ((float) compressed_size / (float) plain_size)); 195 (float) ((float) compressed_size /
196 (float) plain_size));
196#endif 197#endif
197 198
198 if ((size_t) compressed_size > max_comp_size) 199 if ((size_t) compressed_size > max_comp_size)
@@ -234,10 +235,10 @@ MHD_gtls_decompress (comp_hd_t handle, opaque * compressed,
234#ifdef HAVE_LIBZ 235#ifdef HAVE_LIBZ
235 case MHD_GNUTLS_COMP_DEFLATE: 236 case MHD_GNUTLS_COMP_DEFLATE:
236 { 237 {
237 int err; 238 int err;
238 uLongf out_size; 239 uLongf out_size;
239 z_stream *zhandle; 240 z_stream *zhandle;
240 unsigned int cur_pos; 241 unsigned int cur_pos;
241 242
242 *plain = NULL; 243 *plain = NULL;
243 out_size = compressed_size + compressed_size; 244 out_size = compressed_size + compressed_size;