Fixed bug #36496

diff --git a/NEWS b/NEWS
index 90a8009ce68839d2281fb5913a71b8222cb64337..d653eb2023eed790a8fb9829c29d0a33fc09fe68 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@ PHP                                                                        NEWS
 - Fixed bug #39836 (SplObjectStorage empty after unserialize). (Marcus)
 - Fixed bug #39322 (proc_terminate() destroys process resource). (Nuno)
 - Fixed bug #37799 (ftp_ssl_connect() falls back to non-ssl connection). (Nuno)
+- Fixed bug #36496 (SSL support in imap_open() not working on Windows). (Edin)
 - Fixed bug #34794 (proc_close() hangs when used with two processes).
   (jdolecek at netbsd dot org, Nuno)
 

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 6e576a9fa99a037648e8c168cbca1f34a8963437..34aa01a10bb3066958679093388728ad3b3552f5 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -475,10 +475,10 @@ PHP_MINIT_FUNCTION(imap)
        auth_link(&auth_gss);           /* link in the gss authenticator */
 #endif
        auth_link(&auth_pla);           /* link in the plain authenticator */
+#endif
 
 #ifdef HAVE_IMAP_SSL
        ssl_onceonlyinit ();
-#endif
 #endif
 
        /* lets allow NIL */