summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2011-08-06 00:59:21 +0000
committerFelipe Pena <felipe@php.net>2011-08-06 00:59:21 +0000
commitedfa1988fc838f3514802d897c3421c9d8f8471b (patch)
treebc8b141d48aeebc4c9a5335579deea9dfabcf8f2
parent741f41ff1896030ecf2d28853644753696603c37 (diff)
downloadphp-git-edfa1988fc838f3514802d897c3421c9d8f8471b.tar.gz
- Fixed bug #55313 (Number of retries not set when params specified)
patch by: kevin at kevinlocke dot name
-rw-r--r--NEWS6
-rw-r--r--ext/imap/php_imap.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 946e608349..dff75040c5 100644
--- 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 754f69ece6..8eb0290ea0 100644
--- 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 {