resolve conflicts

1 files changed, 12 insertions, 1 deletions

diff --git a/src/lib/libcrypto/comp/c_zlib.c b/src/lib/libcrypto/comp/c_zlib.c
index 8c0876151a..1bd2850d15 100644
--- a/src/lib/libcrypto/comp/c_zlib.c
+++ b/src/lib/libcrypto/comp/c_zlib.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <openssl/objects.h>
 #include <openssl/comp.h>
+#include <openssl/err.h>
 
 COMP_METHOD *COMP_zlib(void );
 
@@ -189,7 +190,17 @@ COMP_METHOD *COMP_zlib(void)
         if (!zlib_loaded)
                 {
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-                zlib_dso = DSO_load(NULL, "ZLIB", NULL, 0);
+                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