Changeset 961

Timestamp:

2012-07-11T06:16:56+02:00 (11 months ago)

Author:

moo

Message:

revert opt out of included_files handling. still required by require()/include(). make it work for new sandbox handling

Location:

trunk

Files:

• utils.c (modified) (5 diffs)
• xcache.c (modified) (1 diff)

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
@@ -774 +772 @@
     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
@@ -795 +791 @@
 #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);
@@ -934 +926 @@
 #endif
 
-#ifndef ZEND_ENGINE_2_2
     i = 1;
+    /* still needed because in zend_language_scanner.l, require()/include() check file_handle.handle.stream.handle */
     zend_hash_add(&OG(included_files), sandbox->filename, strlen(sandbox->filename) + 1, (void *)&i, sizeof(int), NULL);
-#endif
 }
 /* }}} */
@@ -988 +979 @@
     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

trunk/xcache.c

@@ -1848 +1848 @@
     xc_entry_data_php_t restored_php;
     zend_bool catched;
+    zend_uint i;
+
+    /* still needed because in zend_language_scanner.l, require()/include() check file_handle.handle.stream.handle */
+    i = 1;
+    zend_hash_add(&EG(included_files), stored_entry->entry.name.str.val, stored_entry->entry.name.str.len + 1, (void *)&i, sizeof(int), NULL);
 
     CG(in_compilation)    = 1;