Skip to content

Commit d2c1f3f

Browse files
author
[email protected]
committed
First step of implementation of WL#1518 "make bundled zlib
 usable for unix builds": zlib 1.2.1 imported
1 parent 58bdb62 commit d2c1f3f

107 files changed

Lines changed: 5734 additions & 16663 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎VC++Files/zlib/zlib.dsp‎

Lines changed: 8 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mysys/my_crc32.c‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,7 @@
1717
#include "mysys_priv.h"
1818

1919
#ifndef HAVE_COMPRESS
20-
21-
/* minimal set of defines for using crc32() from zlib codebase */
22-
#define _ZLIB_H
23-
#define ZEXPORT
24-
#define Z_NULL 0
25-
#define OF(args) args
2620
#undef DYNAMIC_CRC_TABLE
27-
typedef uchar Byte;
28-
typedef uchar Bytef;
29-
typedef uint uInt;
30-
typedef ulong uLong;
31-
typedef ulong uLongf;
32-
3321
#include "../zlib/crc32.c"
34-
3522
#endif
3623

‎zlib/ChangeLog‎

Lines changed: 253 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,251 @@
11

2-
ChangeLog file for zlib
2+
ChangeLog file for zlib
3+
Changes in port for MySQL (19 July 2004)
4+
- removed contrib, nt, os2, amiga, directories and some other files not used
5+
in MySQL distribution. If you are working on porting MySQL to one of rare
6+
platforms, you might find worth looking at the original zlib distribution
7+
and using appropriate Makefiles/project files from it.
8+
9+
Changes in 1.2.1 (17 November 2003)
10+
- Remove a tab in contrib/gzappend/gzappend.c
11+
- Update some interfaces in contrib for new zlib functions
12+
- Update zlib version number in some contrib entries
13+
- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
14+
- Support shared libraries on Hurd and KFreeBSD [Brown]
15+
- Fix error in NO_DIVIDE option of adler32.c
16+
17+
Changes in 1.2.0.8 (4 November 2003)
18+
- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
19+
- Add experimental NO_DIVIDE #define in adler32.c
20+
- Possibly faster on some processors (let me know if it is)
21+
- Correct Z_BLOCK to not return on first inflate call if no wrap
22+
- Fix strm->data_type on inflate() return to correctly indicate EOB
23+
- Add deflatePrime() function for appending in the middle of a byte
24+
- Add contrib/gzappend for an example of appending to a stream
25+
- Update win32/DLL_FAQ.txt [Truta]
26+
- Delete Turbo C comment in README [Truta]
27+
- Improve some indentation in zconf.h [Truta]
28+
- Fix infinite loop on bad input in configure script [Church]
29+
- Fix gzeof() for concatenated gzip files [Johnson]
30+
- Add example to contrib/visual-basic.txt [Michael B.]
31+
- Add -p to mkdir's in Makefile.in [vda]
32+
- Fix configure to properly detect presence or lack of printf functions
33+
- Add AS400 support [Monnerat]
34+
- Add a little Cygwin support [Wilson]
35+
36+
Changes in 1.2.0.7 (21 September 2003)
37+
- Correct some debug formats in contrib/infback9
38+
- Cast a type in a debug statement in trees.c
39+
- Change search and replace delimiter in configure from % to # [Beebe]
40+
- Update contrib/untgz to 0.2 with various fixes [Truta]
41+
- Add build support for Amiga [Nikl]
42+
- Remove some directories in old that have been updated to 1.2
43+
- Add dylib building for Mac OS X in configure and Makefile.in
44+
- Remove old distribution stuff from Makefile
45+
- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
46+
- Update links in README
47+
48+
Changes in 1.2.0.6 (13 September 2003)
49+
- Minor FAQ updates
50+
- Update contrib/minizip to 1.00 [Vollant]
51+
- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
52+
- Update POSTINC comment for 68060 [Nikl]
53+
- Add contrib/infback9 with deflate64 decoding (unsupported)
54+
- For MVS define NO_vsnprintf and undefine FAR [van Burik]
55+
- Add pragma for fdopen on MVS [van Burik]
56+
57+
Changes in 1.2.0.5 (8 September 2003)
58+
- Add OF to inflateBackEnd() declaration in zlib.h
59+
- Remember start when using gzdopen in the middle of a file
60+
- Use internal off_t counters in gz* functions to properly handle seeks
61+
- Perform more rigorous check for distance-too-far in inffast.c
62+
- Add Z_BLOCK flush option to return from inflate at block boundary
63+
- Set strm->data_type on return from inflate
64+
- Indicate bits unused, if at block boundary, and if in last block
65+
- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
66+
- Add condition so old NO_DEFLATE define still works for compatibility
67+
- FAQ update regarding the Windows DLL [Truta]
68+
- INDEX update: add qnx entry, remove aix entry [Truta]
69+
- Install zlib.3 into mandir [Wilson]
70+
- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
71+
- Adapt the zlib interface to the new DLL convention guidelines [Truta]
72+
- Introduce ZLIB_WINAPI macro to allow the export of functions using
73+
the WINAPI calling convention, for Visual Basic [Vollant, Truta]
74+
- Update msdos and win32 scripts and makefiles [Truta]
75+
- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
76+
- Add contrib/ada [Anisimkov]
77+
- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
78+
- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
79+
- Add contrib/masm686 [Truta]
80+
- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
81+
[Truta, Vollant]
82+
- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
83+
- Remove contrib/delphi2; add a new contrib/delphi [Truta]
84+
- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
85+
and fix some method prototypes [Truta]
86+
- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
87+
[Truta]
88+
- Avoid the use of backslash (\) in contrib/minizip [Vollant]
89+
- Fix file time handling in contrib/untgz; update makefiles [Truta]
90+
- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
91+
[Vollant]
92+
- Remove contrib/vstudio/vc15_16 [Vollant]
93+
- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
94+
- Update README.contrib [Truta]
95+
- Invert the assignment order of match_head and s->prev[...] in
96+
INSERT_STRING [Truta]
97+
- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
98+
[Truta]
99+
- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
100+
- Fix prototype of syncsearch in inflate.c [Truta]
101+
- Introduce ASMINF macro to be enabled when using an ASM implementation
102+
of inflate_fast [Truta]
103+
- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
104+
- Modify test_gzio in example.c to take a single file name as a
105+
parameter [Truta]
106+
- Exit the example.c program if gzopen fails [Truta]
107+
- Add type casts around strlen in example.c [Truta]
108+
- Remove casting to sizeof in minigzip.c; give a proper type
109+
to the variable compared with SUFFIX_LEN [Truta]
110+
- Update definitions of STDC and STDC99 in zconf.h [Truta]
111+
- Synchronize zconf.h with the new Windows DLL interface [Truta]
112+
- Use SYS16BIT instead of __32BIT__ to distinguish between
113+
16- and 32-bit platforms [Truta]
114+
- Use far memory allocators in small 16-bit memory models for
115+
Turbo C [Truta]
116+
- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
117+
zlibCompileFlags [Truta]
118+
- Cygwin has vsnprintf [Wilson]
119+
- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
120+
- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
121+
122+
Changes in 1.2.0.4 (10 August 2003)
123+
- Minor FAQ updates
124+
- Be more strict when checking inflateInit2's windowBits parameter
125+
- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
126+
- Add gzip wrapper option to deflateInit2 using windowBits
127+
- Add updated QNX rule in configure and qnx directory [Bonnefoy]
128+
- Make inflate distance-too-far checks more rigorous
129+
- Clean up FAR usage in inflate
130+
- Add casting to sizeof() in gzio.c and minigzip.c
131+
132+
Changes in 1.2.0.3 (19 July 2003)
133+
- Fix silly error in gzungetc() implementation [Vollant]
134+
- Update contrib/minizip and contrib/vstudio [Vollant]
135+
- Fix printf format in example.c
136+
- Correct cdecl support in zconf.in.h [Anisimkov]
137+
- Minor FAQ updates
138+
139+
Changes in 1.2.0.2 (13 July 2003)
140+
- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
141+
- Attempt to avoid warnings in crc32.c for pointer-int conversion
142+
- Add AIX to configure, remove aix directory [Bakker]
143+
- Add some casts to minigzip.c
144+
- Improve checking after insecure sprintf() or vsprintf() calls
145+
- Remove #elif's from crc32.c
146+
- Change leave label to inf_leave in inflate.c and infback.c to avoid
147+
library conflicts
148+
- Remove inflate gzip decoding by default--only enable gzip decoding by
149+
special request for stricter backward compatibility
150+
- Add zlibCompileFlags() function to return compilation information
151+
- More typecasting in deflate.c to avoid warnings
152+
- Remove leading underscore from _Capital #defines [Truta]
153+
- Fix configure to link shared library when testing
154+
- Add some Windows CE target adjustments [Mai]
155+
- Remove #define ZLIB_DLL in zconf.h [Vollant]
156+
- Add zlib.3 [Rodgers]
157+
- Update RFC URL in deflate.c and algorithm.txt [Mai]
158+
- Add zlib_dll_FAQ.txt to contrib [Truta]
159+
- Add UL to some constants [Truta]
160+
- Update minizip and vstudio [Vollant]
161+
- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
162+
- Expand use of NO_DUMMY_DECL to avoid all dummy structures
163+
- Added iostream3 to contrib [Schwardt]
164+
- Replace rewind() with fseek() for WinCE [Truta]
165+
- Improve setting of zlib format compression level flags
166+
- Report 0 for huffman and rle strategies and for level == 0 or 1
167+
- Report 2 only for level == 6
168+
- Only deal with 64K limit when necessary at compile time [Truta]
169+
- Allow TOO_FAR check to be turned off at compile time [Truta]
170+
- Add gzclearerr() function [Souza]
171+
- Add gzungetc() function
172+
173+
Changes in 1.2.0.1 (17 March 2003)
174+
- Add Z_RLE strategy for run-length encoding [Truta]
175+
- When Z_RLE requested, restrict matches to distance one
176+
- Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
177+
- Correct FASTEST compilation to allow level == 0
178+
- Clean up what gets compiled for FASTEST
179+
- Incorporate changes to zconf.in.h [Vollant]
180+
- Refine detection of Turbo C need for dummy returns
181+
- Refine ZLIB_DLL compilation
182+
- Include additional header file on VMS for off_t typedef
183+
- Try to use _vsnprintf where it supplants vsprintf [Vollant]
184+
- Add some casts in inffast.c
185+
- Enchance comments in zlib.h on what happens if gzprintf() tries to
186+
write more than 4095 bytes before compression
187+
- Remove unused state from inflateBackEnd()
188+
- Remove exit(0) from minigzip.c, example.c
189+
- Get rid of all those darn tabs
190+
- Add "check" target to Makefile.in that does the same thing as "test"
191+
- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
192+
- Update contrib/inflate86 [Anderson]
193+
- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
194+
- Add msdos and win32 directories with makefiles [Truta]
195+
- More additions and improvements to the FAQ
196+
197+
Changes in 1.2.0 (9 March 2003)
198+
- New and improved inflate code
199+
- About 20% faster
200+
- Does not allocate 32K window unless and until needed
201+
- Automatically detects and decompresses gzip streams
202+
- Raw inflate no longer needs an extra dummy byte at end
203+
- Added inflateBack functions using a callback interface--even faster
204+
than inflate, useful for file utilities (gzip, zip)
205+
- Added inflateCopy() function to record state for random access on
206+
externally generated deflate streams (e.g. in gzip files)
207+
- More readable code (I hope)
208+
- New and improved crc32()
209+
- About 50% faster, thanks to suggestions from Rodney Brown
210+
- Add deflateBound() and compressBound() functions
211+
- Fix memory leak in deflateInit2()
212+
- Permit setting dictionary for raw deflate (for parallel deflate)
213+
- Fix const declaration for gzwrite()
214+
- Check for some malloc() failures in gzio.c
215+
- Fix bug in gzopen() on single-byte file 0x1f
216+
- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
217+
and next buffer doesn't start with 0x8b
218+
- Fix uncompress() to return Z_DATA_ERROR on truncated input
219+
- Free memory at end of example.c
220+
- Remove MAX #define in trees.c (conflicted with some libraries)
221+
- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
222+
- Declare malloc() and free() in gzio.c if STDC not defined
223+
- Use malloc() instead of calloc() in zutil.c if int big enough
224+
- Define STDC for AIX
225+
- Add aix/ with approach for compiling shared library on AIX
226+
- Add HP-UX support for shared libraries in configure
227+
- Add OpenUNIX support for shared libraries in configure
228+
- Use $cc instead of gcc to build shared library
229+
- Make prefix directory if needed when installing
230+
- Correct Macintosh avoidance of typedef Byte in zconf.h
231+
- Correct Turbo C memory allocation when under Linux
232+
- Use libz.a instead of -lz in Makefile (assure use of compiled library)
233+
- Update configure to check for snprintf or vsnprintf functions and their
234+
return value, warn during make if using an insecure function
235+
- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
236+
is lost when library is used--resolution is to build new zconf.h
237+
- Documentation improvements (in zlib.h):
238+
- Document raw deflate and inflate
239+
- Update RFCs URL
240+
- Point out that zlib and gzip formats are different
241+
- Note that Z_BUF_ERROR is not fatal
242+
- Document string limit for gzprintf() and possible buffer overflow
243+
- Note requirement on avail_out when flushing
244+
- Note permitted values of flush parameter of inflate()
245+
- Add some FAQs (and even answers) to the FAQ
246+
- Add contrib/inflate86/ for x86 faster inflate
247+
- Add contrib/blast/ for PKWare Data Compression Library decompression
248+
- Add contrib/puff/ simple inflate for deflate format description
3249

4250
Changes in 1.1.4 (11 March 2002)
5251
- ZFREE was repeated on same allocation on some error conditions.
@@ -10,7 +256,7 @@ Changes in 1.1.4 (11 March 2002)
10256
less than 32K.
11257
- force windowBits > 8 to avoid a bug in the encoder for a window size
12258
of 256 bytes. (A complete fix will be available in 1.1.5).
13-
259+
14260
Changes in 1.1.3 (9 July 1998)
15261
- fix "an inflate input buffer bug that shows up on rare but persistent
16262
occasions" (Mark)
@@ -184,13 +430,13 @@ Changes in 1.0.6 (19 Jan 1998)
184430
- added Makefile.nt (thanks to Stephen Williams)
185431
- added the unsupported "contrib" directory:
186432
contrib/asm386/ by Gilles Vollant <[email protected]>
187-
386 asm code replacing longest_match().
433+
386 asm code replacing longest_match().
188434
contrib/iostream/ by Kevin Ruland <[email protected]>
189435
A C++ I/O streams interface to the zlib gz* functions
190436
contrib/iostream2/ by Tyge L�vset <[email protected]>
191-
Another C++ I/O streams interface
437+
Another C++ I/O streams interface
192438
contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <[email protected]>
193-
A very simple tar.gz file extractor using zlib
439+
A very simple tar.gz file extractor using zlib
194440
contrib/visual-basic.txt by Carlos Rios <[email protected]>
195441
How to use compress(), uncompress() and the gz* functions from VB.
196442
- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
@@ -217,7 +463,7 @@ Changes in 1.0.6 (19 Jan 1998)
217463
- add NEED_DUMMY_RETURN for Borland
218464
- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
219465
- allow compilation with CC
220-
- defined STDC for OS/2 (David Charlap)
466+
- defined STDC for OS/2 (David Charlap)
221467
- limit external names to 8 chars for MVS (Thomas Lund)
222468
- in minigzip.c, use static buffers only for 16-bit systems
223469
- fix suffix check for "minigzip -d foo.gz"
@@ -242,7 +488,7 @@ Changes in 1.0.5 (3 Jan 98)
242488
- Eliminate memory leaks on error conditions in inflate
243489
- Removed some vestigial code in inflate
244490
- Update web address in README
245-
491+
246492
Changes in 1.0.4 (24 Jul 96)
247493
- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
248494
bit, so the decompressor could decompress all the correct data but went

0 commit comments

Comments
 (0)