Commit 5b0f1f7d authored by Richard Levitte's avatar Richard Levitte
Browse files

Because libraries on Windows lack useful version information, the zlib 

guys had to change the name to differentiate with older versions when
a backward incompatibility came up.  Of course, we need to adapt.
This change simply tries to load the library through the newer name
(ZLIB1) first, and if that fails, it tries the good old ZLIB.
parent 785e8273

crypto/comp/c_zlib.c

+11 −1
Original line number Diff line number Diff line
@@ -357,7 +357,17 @@ COMP_METHOD *COMP_zlib(void) 
	if (!zlib_loaded)

		{

#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)

		zlib_dso = DSO_load(NULL, "ZLIB1", NULL, 0);

		if (!zlib_dso)

			{

			zlib_dso = DSO_load(NULL, "ZLIB", NULL, 0);

			if (zlib_dso)

				{

				/* Clear the errors from the first failed

				   DSO_load() */

				ERR_clear_error();

				}

			}

#else

		zlib_dso = DSO_load(NULL, "z", NULL, 0);

#endif