php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ZTS mode (hopefully all is working fine now again)

Browse Source
This commit is contained in:
Marcus Boerger
2003-06-14 19:30:42 +00:00
parent 8f2b387c61
commit f304458bdb
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/file.c
+4 -2
View File
@@ -130,8 +130,10 @@ PHPAPI int php_le_stream_context(void)
static ZEND_RSRC_DTOR_FUNC(file_context_dtor)
{
php_stream_context *context = (php_stream_context*)rsrc->ptr;
zval_dtor(context->options);
context->options = NULL;
if (context->options) {
zval_ptr_dtor(&context->options);
context->options = NULL;
}
php_stream_context_free(context);
}
main/streams/streams.c
+6 -3
View File
@@ -413,7 +413,7 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_D
size_t justread = 0;
int flags;
php_stream_bucket *bucket;
php_stream_filter_status_t status;
php_stream_filter_status_t status = PSFS_ERR_FATAL;
php_stream_filter *filter;
/* read a chunk into a bucket */
@@ -893,7 +893,7 @@ static size_t _php_stream_write_filtered(php_stream *stream, const char *buf, si
php_stream_bucket *bucket;
php_stream_bucket_brigade brig_in = { NULL, NULL }, brig_out = { NULL, NULL };
php_stream_bucket_brigade *brig_inp = &brig_in, *brig_outp = &brig_out, *brig_swap;
php_stream_filter_status_t status;
php_stream_filter_status_t status = PSFS_ERR_FATAL;
php_stream_filter *filter;
if (buf) {
@@ -1618,7 +1618,10 @@ PHPAPI void php_stream_notification_notify(php_stream_context *context, int noti
PHPAPI void php_stream_context_free(php_stream_context *context)
{
zval_ptr_dtor(&context->options);
if (context->options) {
zval_ptr_dtor(&context->options);
context->options = NULL;
}
efree(context);
}