felipe                                   Sun, 02 May 2010 20:11:22 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=298882

Log:
- Revert accidental changes

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/file.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/file.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/file.c    2010-05-02 19:34:21 UTC 
(rev 298881)
+++ php/php-src/branches/PHP_5_3/ext/standard/file.c    2010-05-02 20:11:22 UTC 
(rev 298882)
@@ -136,13 +136,27 @@

 /* {{{ 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
 */
+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)
 {
        FG(pclose_ret) = 0;
@@ -162,6 +176,7 @@

 PHP_MINIT_FUNCTION(file)
 {
+       le_stream_context = 
zend_register_list_destructors_ex(file_context_dtor, NULL, "stream-context", 
module_number);

 #ifdef ZTS
        ts_allocate_id(&file_globals_id, sizeof(php_file_globals), 
(ts_allocate_ctor) file_globals_ctor, (ts_allocate_dtor) file_globals_dtor);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to