pajoye Sun, 10 Jul 2011 14:19:51 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313109
Log: - use warning here to match unix behavior Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/mcrypt/mcrypt.c U php/php-src/branches/PHP_5_4/ext/mcrypt/mcrypt.c U php/php-src/trunk/ext/mcrypt/mcrypt.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-07-10 13:24:54 UTC (rev 313108) +++ php/php-src/branches/PHP_5_3/NEWS 2011-07-10 14:19:51 UTC (rev 313109) @@ -12,6 +12,10 @@ . Fixed bug #52935 (call exit in user_error_handler cause stream relate core). (Gustavo) +- MCrypt + . Change E_ERROR to E_WARNING in mcrypt_create_iv when not enough data + has been fetched (Windows). (Pierre) + - PDO DBlib: . Fixed bug #54329 (MSSql extension memory leak). (dotslashpok at gmail dot com) Modified: php/php-src/branches/PHP_5_3/ext/mcrypt/mcrypt.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mcrypt/mcrypt.c 2011-07-10 13:24:54 UTC (rev 313108) +++ php/php-src/branches/PHP_5_3/ext/mcrypt/mcrypt.c 2011-07-10 14:19:51 UTC (rev 313109) @@ -1394,7 +1394,7 @@ BYTE *iv_b = (BYTE *) iv; if (php_win32_get_random_bytes(iv_b, (size_t) size) == FAILURE){ efree(iv); - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not gather sufficient random data"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not gather sufficient random data"); RETURN_FALSE; } n = size; Modified: php/php-src/branches/PHP_5_4/ext/mcrypt/mcrypt.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/mcrypt/mcrypt.c 2011-07-10 13:24:54 UTC (rev 313108) +++ php/php-src/branches/PHP_5_4/ext/mcrypt/mcrypt.c 2011-07-10 14:19:51 UTC (rev 313109) @@ -1394,7 +1394,7 @@ BYTE *iv_b = (BYTE *) iv; if (php_win32_get_random_bytes(iv_b, (size_t) size) == FAILURE){ efree(iv); - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not gather sufficient random data"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not gather sufficient random data"); RETURN_FALSE; } n = size; Modified: php/php-src/trunk/ext/mcrypt/mcrypt.c =================================================================== --- php/php-src/trunk/ext/mcrypt/mcrypt.c 2011-07-10 13:24:54 UTC (rev 313108) +++ php/php-src/trunk/ext/mcrypt/mcrypt.c 2011-07-10 14:19:51 UTC (rev 313109) @@ -1394,7 +1394,7 @@ BYTE *iv_b = (BYTE *) iv; if (php_win32_get_random_bytes(iv_b, (size_t) size) == FAILURE){ efree(iv); - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not gather sufficient random data"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not gather sufficient random data"); RETURN_FALSE; } n = size;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php