felipe Sat, 06 Aug 2011 00:59:21 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=314350
Log: - Fixed bug #55313 (Number of retries not set when params specified) patch by: kevin at kevinlocke dot name Bug: https://bugs.php.net/55313 (Open) Number of retries not set when params specified Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/imap/php_imap.c U php/php-src/branches/PHP_5_4/ext/imap/php_imap.c U php/php-src/trunk/ext/imap/php_imap.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-08-05 22:39:40 UTC (rev 314349) +++ php/php-src/branches/PHP_5_3/NEWS 2011-08-06 00:59:21 UTC (rev 314350) @@ -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) Modified: php/php-src/branches/PHP_5_3/ext/imap/php_imap.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/imap/php_imap.c 2011-08-05 22:39:40 UTC (rev 314349) +++ php/php-src/branches/PHP_5_3/ext/imap/php_imap.c 2011-08-06 00:59:21 UTC (rev 314350) @@ -1233,7 +1233,7 @@ 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 { Modified: php/php-src/branches/PHP_5_4/ext/imap/php_imap.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/imap/php_imap.c 2011-08-05 22:39:40 UTC (rev 314349) +++ php/php-src/branches/PHP_5_4/ext/imap/php_imap.c 2011-08-06 00:59:21 UTC (rev 314350) @@ -1227,7 +1227,7 @@ 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 { Modified: php/php-src/trunk/ext/imap/php_imap.c =================================================================== --- php/php-src/trunk/ext/imap/php_imap.c 2011-08-05 22:39:40 UTC (rev 314349) +++ php/php-src/trunk/ext/imap/php_imap.c 2011-08-06 00:59:21 UTC (rev 314350) @@ -1227,7 +1227,7 @@ 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 {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
