edink Mon Feb 19 16:03:42 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/imap php_imap.c
Log:
Fixed bug #36496
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.546&r2=1.2027.2.547.2.547&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.546 php-src/NEWS:1.2027.2.547.2.547
--- php-src/NEWS:1.2027.2.547.2.546 Sun Feb 18 16:54:59 2007
+++ php-src/NEWS Mon Feb 19 16:03:42 2007
@@ -31,6 +31,7 @@
- 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)
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.19&r2=1.208.2.7.2.20&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.19
php-src/ext/imap/php_imap.c:1.208.2.7.2.20
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.19 Fri Feb 16 13:28:03 2007
+++ php-src/ext/imap/php_imap.c Mon Feb 19 16:03:42 2007
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.19 2007/02/16 13:28:03 tony2001 Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.20 2007/02/19 16:03:42 edink Exp $ */
#define IMAP41
@@ -475,11 +475,11 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
