summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--ext/imap/php_imap.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 90a8009ce6..d653eb2023 100644
--- 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 6e576a9fa9..34aa01a10b 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -475,11 +475,11 @@ 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 */
REGISTER_LONG_CONSTANT("NIL", NIL, CONST_PERSISTENT | CONST_CS);