Changeset 954 for trunk/utils.c

Timestamp:

2012-07-06T11:18:49+02:00 (11 months ago)

Author:

moo

Message:

restore open_files handling, it is required. disable included_files which is real EG since PHP 5_2

File:

• trunk/utils.c (modified) (5 diffs)

trunk/utils.c

@@ -585 +585 @@
     ZEND_24(NOTHING, const) char *filename;
 
+#ifndef ZEND_ENGINE_2_2
     HashTable orig_included_files;
     HashTable *tmp_included_files;
+#endif
 
 #ifdef HAVE_XCACHE_CONSTANT
@@ -772 +774 @@
     memset(sandbox, 0, sizeof(sandbox[0]));
 
+#ifndef ZEND_ENGINE_2_2
     memcpy(&OG(included_files), &EG(included_files), sizeof(EG(included_files)));
+#endif
 
 #ifdef HAVE_XCACHE_CONSTANT
@@ -791 +795 @@
 #endif
 
+#ifndef ZEND_ENGINE_2_2
     TG(included_files) = &EG(included_files);
-
+#endif
+
+#ifndef ZEND_ENGINE_2_2
     zend_hash_init_ex(TG(included_files), 5, NULL, NULL, 0, 1);
+#endif
 #ifdef HAVE_XCACHE_CONSTANT
     h = OG(zend_constants);
@@ -926 +934 @@
 #endif
 
+#ifndef ZEND_ENGINE_2_2
     i = 1;
     zend_hash_add(&OG(included_files), sandbox->filename, strlen(sandbox->filename) + 1, (void *)&i, sizeof(int), NULL);
+#endif
 }
 /* }}} */
@@ -978 +988 @@
     zend_hash_destroy(&TG(auto_globals));
 #endif
+#ifndef ZEND_ENGINE_2_2
     zend_hash_destroy(TG(included_files));
-
+#endif
+
+#ifndef ZEND_ENGINE_2_2
     /* restore orig here, as EG/CG holded tmp before */
     memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files)));
+#endif
 
 #ifdef XCACHE_ERROR_CACHING