Changeset 617 for branches/1.3/xcache.c

Timestamp:

2009-07-05T08:30:54+02:00 (4 years ago)

Author:

moo

Message:

PHP 5.3 support

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xcache.c (modified) (4 diffs)

branches/1.3/xcache.c

@@ -542 +542 @@
     xc_entry_data_php_t *p = xce->data.php;
     zend_op_array *old_active_op_array = CG(active_op_array);
+    ALLOCA_FLAG(use_heap)
+
 #ifndef ZEND_ENGINE_2
     /* new ptr which is stored inside CG(class_table) */
-    xc_cest_t **new_cest_ptrs = (xc_cest_t **)do_alloca(sizeof(xc_cest_t*) * p->classinfo_cnt);
+    xc_cest_t **new_cest_ptrs = (xc_cest_t **)my_do_alloca(sizeof(xc_cest_t*) * p->classinfo_cnt, use_heap);
 #endif
 
@@ -605 +607 @@
 
 #ifndef ZEND_ENGINE_2
-    free_alloca(new_cest_ptrs);
+    my_free_alloca(new_cest_ptrs, use_heap);
 #endif
     CG(active_op_array) = old_active_op_array;
@@ -649 +651 @@
     int size = strlen(include_path) + 1;
     char tokens[] = { DEFAULT_DIR_SEPARATOR, '\0' };
-
-    paths = (char *)do_alloca(size);
+    ALLOCA_FLAG(use_heap)
+
+    paths = (char *)my_do_alloca(size, use_heap);
     memcpy(paths, include_path, size);
 
@@ -658 +661 @@
         }
         if (VCWD_STAT(filepath, pbuf) == 0) {
-            free_alloca(paths);
+            my_free_alloca(paths, use_heap);
             return SUCCESS;
         }
     }
 
-    free_alloca(paths);
+    my_free_alloca(paths, use_heap);
 
     return FAILURE;