MFH: Fixed bug #24557 (make fclose() respect refcount on the resource).

diff --git a/NEWS b/NEWS
index 6307f36add69e15f08b1ff35167ec682d19ad194..044e385392c58dcf4437014ece0692c78992b554 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,8 @@ PHP 4                                                                      NEWS
 - Fixed bug #24573 (debug_backtrace() crashes if $this set to null). (Jani)
 - Fixed bug #24560 (parse_url() incorrectly handling certain file:// based 
   schemas). (Ilia)
+- Fixed bug #24557 (make fclose() respect refcount on the resource). 
+  (Wez, Ilia)
 - Fixed bug #24537 (apache2 compile misses some include directories). (Jani)
 - Fixed bug #24535 (ext/mysql: crash when retrieving data from unbuffered
   result after the original connection has been changed). (Ilia)

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 334fcc18558d4e42f8f04bfa99744da337e1100c..6a09e29dc39b86ee4e7d26bc4c920912792e6e01 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1156,7 +1156,7 @@ PHPAPI PHP_FUNCTION(fclose)
        }
 
        php_stream_from_zval(stream, arg1);
-       php_stream_close(stream);
+       zend_list_delete(stream->rsrc_id);
 
        RETURN_TRUE;
 }