wez Thu Jun 9 08:15:15 2005 EDT
Modified files:
/php-src/main main.c
Log:
hmm, backing out this change, as it seems to cause problems with user-space
streams and filters (the ZE needs to close them before it blows away the
user-space code.
Noticed by Dmitry. Still need to find out how to avoid double-closing
streams.
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.630&r2=1.631&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.630 php-src/main/main.c:1.631
--- php-src/main/main.c:1.630 Mon Jun 6 18:01:41 2005
+++ php-src/main/main.c Thu Jun 9 08:15:14 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.630 2005/06/06 22:01:41 sniper Exp $ */
+/* $Id: main.c,v 1.631 2005/06/09 12:15:14 wez Exp $ */
/* {{{ includes
*/
@@ -835,12 +835,10 @@
}
/* }}} */
-#if wez_0
static void stream_closer_for_zend(void *handle TSRMLS_DC)
{
php_stream_close((php_stream*)handle);
}
-#endif
static long stream_fteller_for_zend(void *handle TSRMLS_DC)
{
@@ -859,10 +857,7 @@
handle->free_filename = 0;
handle->handle.stream.handle = stream;
handle->handle.stream.reader =
(zend_stream_reader_t)_php_stream_read;
- /* don't set this; all streams are tracked as part of the
resource system,
- * and we'll end up double-free'ing them if we allow zend to
close them
- * down after the resource list has been cleaned up */
- handle->handle.stream.closer = NULL; /* stream_closer_for_zend;
*/
+ handle->handle.stream.closer = stream_closer_for_zend;
handle->handle.stream.fteller = stream_fteller_for_zend;
handle->handle.stream.interactive = 0;
/* suppress warning if this stream is not explicitly closed */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
