upgraded to zlib 1.2.2 (replaces patch with CAN-2004-0797 vulnerability fix with official upstream fix)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-05 15:55:19 +00:00
parent a6285dc957
commit ba0052f3f5
14 changed files with 184 additions and 101 deletions
--- a/src/zlib/deflate.h
+++ b/src/zlib/deflate.h
@@ -95,7 +95,6 @@ typedef struct internal_state {
    Bytef *pending_out;  /* next pending byte to output to the stream */
    int   pending;       /* nb of bytes in the pending buffer */
    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
-    Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
    Byte  method;        /* STORED (for zip only) or DEFLATED */
    int   last_flush;    /* value of flush param for previous deflate call */