clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Revert accidental changes

Browse Source
This commit is contained in:
Felipe Pena 2010-05-02 20:11:22 +00:00
parent 90c336026e
commit 151fc3b7c0
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/standard/file.c
View File

@ -136,12 +136,26 @@ php_file_globals file_globals;
/* {{{ ZTS-stuff / Globals / Prototypes */ /* {{{ ZTS-stuff / Globals / Prototypes */
/* sharing globals is *evil* */
static int le_stream_context = FAILURE;
PHPAPI int php_le_stream_context(void)
{
return le_stream_context;
}
/* }}} */ /* }}} */
/* {{{ Module-Stuff /* {{{ Module-Stuff
*/ */
static ZEND_RSRC_DTOR_FUNC(file_context_dtor)
{
php_stream_context *context = (php_stream_context*)rsrc->ptr;
if (context->options) {
zval_ptr_dtor(&context->options);
context->options = NULL;
}
php_stream_context_free(context);
}
static void file_globals_ctor(php_file_globals *file_globals_p TSRMLS_DC) static void file_globals_ctor(php_file_globals *file_globals_p TSRMLS_DC)
{ {
@ -162,6 +176,7 @@ PHP_INI_END()
PHP_MINIT_FUNCTION(file) PHP_MINIT_FUNCTION(file)
{ {
le_stream_context = zend_register_list_destructors_ex(file_context_dtor, NULL, "stream-context", module_number);
#ifdef ZTS #ifdef ZTS
ts_allocate_id(&file_globals_id, sizeof(php_file_globals), (ts_allocate_ctor) file_globals_ctor, (ts_allocate_dtor) file_globals_dtor); ts_allocate_id(&file_globals_id, sizeof(php_file_globals), (ts_allocate_ctor) file_globals_ctor, (ts_allocate_dtor) file_globals_dtor);