tony2001 Wed Mar 5 12:09:34 2008 UTC
Modified files:
/php-src/ext/standard dir.c
Log:
apply better fix, so that the default handle would be closed when closing its
reference
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.174&r2=1.175&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.174 php-src/ext/standard/dir.c:1.175
--- php-src/ext/standard/dir.c:1.174 Wed Mar 5 09:28:41 2008
+++ php-src/ext/standard/dir.c Wed Mar 5 12:09:33 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.174 2008/03/05 09:28:41 tony2001 Exp $ */
+/* $Id: dir.c,v 1.175 2008/03/05 12:09:33 tony2001 Exp $ */
/* {{{ includes/startup/misc */
@@ -278,13 +278,15 @@
{
zval **id, **tmp, *myself;
php_stream *dirp;
+ int rsrc_id;
FETCH_DIRP();
- if (dirp->rsrc_id == DIRG(default_dir)) {
+ rsrc_id = dirp->rsrc_id;
+ zend_list_delete(dirp->rsrc_id);
+
+ if (rsrc_id == DIRG(default_dir)) {
php_set_default_dir(-1 TSRMLS_CC);
- } else {
- zend_list_delete(dirp->rsrc_id);
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
