- Fixed bug #55313 (Number of retries not set when params specified)

  patch by: kevin at kevinlocke dot name

diff --git a/NEWS b/NEWS
index 946e608349e3496bd5043369ee77616ba9ce6c53..dff75040c548eed7784e19f7e17af9ab371fe8aa 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 5.3.7
-- mysqli
+- Imap extension:
+  . Fixed bug #55313 (Number of retries not set when params specified).
+    (kevin at kevinlocke dot name)
+
+- MySQLi extension:
   . Fixed bug #55238 (SSL options set by mysqli_ssl_set ignored for MySQLi
     persistent connections). (Andrey)
   

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 754f69ece6d72ee627619c81a7437ea10ec97409..8eb0290ea07618c556362b7ee92bb99e201123e8 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -1233,7 +1233,7 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
        IMAPG(imap_password) = estrndup(passwd, passwd_len);
 
 #ifdef SET_MAXLOGINTRIALS
-       if (argc == 5) {
+       if (argc >= 5) {
                if (retries < 0) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING ,"Retries must be greater or equal to 0");
                } else {