[master] b54b740 Disable more bits of libvgz we never use.

Poul-Henning Kamp phk at FreeBSD.org
Thu Nov 16 11:51:05 UTC 2017


commit b54b740bf91d87ffe2780257e2a83ac134a2f798
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 16 11:49:45 2017 +0000

    Disable more bits of libvgz we never use.

diff --git a/lib/libvgz/deflate.c b/lib/libvgz/deflate.c
index 0b300c7..b40a64e 100644
--- a/lib/libvgz/deflate.c
+++ b/lib/libvgz/deflate.c
@@ -374,10 +374,10 @@ local int deflateStateCheck (strm)
 #ifdef GZIP
                                            s->status != GZIP_STATE &&
 #endif
-                                           s->status != EXTRA_STATE &&
-                                           s->status != NAME_STATE &&
-                                           s->status != COMMENT_STATE &&
-                                           s->status != HCRC_STATE &&
+                                           // s->status != EXTRA_STATE &&
+                                           // s->status != NAME_STATE &&
+                                           // s->status != COMMENT_STATE &&
+                                           // s->status != HCRC_STATE &&
                                            s->status != BUSY_STATE &&
                                            s->status != FINISH_STATE))
         return 1;
@@ -893,6 +893,10 @@ int ZEXPORT deflate (strm, flush)
             }
         }
         else {
+		abort();
+	}
+    }
+#ifdef NOVGZ
             put_byte(s, (s->gzhead->text ? 1 : 0) +
                      (s->gzhead->hcrc ? 2 : 0) +
                      (s->gzhead->extra == Z_NULL ? 0 : 4) +
@@ -1011,6 +1015,7 @@ int ZEXPORT deflate (strm, flush)
         }
     }
 #endif
+#endif
 
     if (strm->start_bit == 0)
         strm->start_bit = (strm->total_out + s->pending) * 8 + s->bi_valid;


More information about the varnish-commit mailing list