cvs: php4 / NEWS /ext/standard/tests/file bug20424.phpt /main streams.c

derick Thu Nov 14 05:56:36 2002 EDT Modified files: /php4 NEWS /php4/ext/standard/tests/file bug20424.phpt /php4/main streams.c Log: - MFB: Fixed bug #20484 (stream_get_meta_data crashes on a normal file stream). (Derick, Wez) Index: php4/NEWS diff -u php4/NEWS:1.1253 php4/NEWS:1.1254 --- php4/NEWS:1.1253 Wed Nov 13 20:54:38 2002 +++ php4/NEWS Thu Nov 14 05:56:35 2002 @@ -1,6 +1,8 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ? ? ??? 200?, Version 4.4.0 +- Fixed bug #20424 (stream_get_meta_data craches on a normal file stream). + (Derick, Wez) - Added imagefilter() function which allows application of various filters. This function is only available with bundled GD. (Pierre-Alain Joye, Ilia) Index: php4/ext/standard/tests/file/bug20424.phpt diff -u /dev/null php4/ext/standard/tests/file/bug20424.phpt:1.2 --- /dev/null Thu Nov 14 05:56:36 2002 +++ php4/ext/standard/tests/file/bug20424.phpt Thu Nov 14 05:56:35 2002 @@ -0,0 +1,12 @@ +--TEST-- +Bug #20424: stream_get_meta_data craches on a normal file stream +--POST-- +--GET-- +--FILE-- +<?php +$f = fopen("run-tests.php", "r"); +$dummy = var_export(stream_get_meta_data($f), TRUE); +echo "I'm alive!\n"; +?> +--EXPECT-- +I'm alive! Index: php4/main/streams.c diff -u php4/main/streams.c:1.125 php4/main/streams.c:1.126 --- php4/main/streams.c:1.125 Sun Nov 10 00:14:26 2002 +++ php4/main/streams.c Thu Nov 14 05:56:35 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.125 2002/11/10 05:14:26 iliaa Exp $ */ +/* $Id: streams.c,v 1.126 2002/11/14 10:56:35 derick Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -2029,7 +2029,8 @@ NULL, NULL, php_plain_files_url_stater, - php_plain_files_dir_opener + php_plain_files_dir_opener, + "plainfile" }; static php_stream_wrapper php_plain_files_wrapper = {