cvs: php-src(PHP_5_2) / NEWS /ext/standard image.c

iliaa Tue May 8 18:38:21 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/standard image.c Log: Fixed bug #41321 (downgrade read errors in getimagesize() to E_NOTICE). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.688&r2=1.2027.2.547.2.689&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.688 php-src/NEWS:1.2027.2.547.2.689 --- php-src/NEWS:1.2027.2.547.2.688 Tue May 8 12:08:17 2007 +++ php-src/NEWS Tue May 8 18:38:20 2007 @@ -7,6 +7,8 @@ (Ilia) - Fixed altering $this via argument named "this". (Dmitry) - Fixed PHP CLI to use the php.ini from the binary location. (Hannes) +- Fixed bug #41321 (downgrade read errors in getimagesize() to E_NOTICE). + (Ilia) - Fixed bug #41304 (compress.zlib temp files left). (Dmitry) - Fixed bug #41293 (Fixed creation of HTTP_RAW_POST_DATA when there is no default post handler). (Ilia) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/image.c?r1=1.114.2.2.2.4&r2=1.114.2.2.2.5&diff_format=u Index: php-src/ext/standard/image.c diff -u php-src/ext/standard/image.c:1.114.2.2.2.4 php-src/ext/standard/image.c:1.114.2.2.2.5 --- php-src/ext/standard/image.c:1.114.2.2.2.4 Sat Feb 24 02:17:27 2007 +++ php-src/ext/standard/image.c Tue May 8 18:38:20 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.114.2.2.2.4 2007/02/24 02:17:27 helly Exp $ */ +/* $Id: image.c,v 1.114.2.2.2.5 2007/05/08 18:38:20 iliaa Exp $ */ #include "php.h" #include <stdio.h> @@ -1185,7 +1185,7 @@ if ( !filetype) filetype = tmp; if((php_stream_read(stream, filetype, 3)) != 3) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Read error!"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Read error!"); return IMAGE_FILETYPE_UNKNOWN; } @@ -1196,7 +1196,7 @@ return IMAGE_FILETYPE_JPEG; } else if (!memcmp(filetype, php_sig_png, 3)) { if (php_stream_read(stream, filetype+3, 5) != 5) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Read error!"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Read error!"); return IMAGE_FILETYPE_UNKNOWN; } if (!memcmp(filetype, php_sig_png, 8)) { @@ -1218,7 +1218,7 @@ } if (php_stream_read(stream, filetype+3, 1) != 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Read error!"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Read error!"); return IMAGE_FILETYPE_UNKNOWN; } /* BYTES READ: 4 */ @@ -1233,7 +1233,7 @@ } if (php_stream_read(stream, filetype+4, 8) != 8) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Read error!"); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Read error!"); return IMAGE_FILETYPE_UNKNOWN; } /* BYTES READ: 12 */