Changeset 485 for trunk/xcache.c

Timestamp:

12/28/2007 10:16:12 AM (11 months ago)

Author:

moo

Message:

5.3 support

Files:

• trunk/xcache.c (modified) (6 diffs)

trunk/xcache.c

@@ -609 +609 @@
     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
 
@@ -672 +674 @@
 
 #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;
@@ -716 +718 @@
     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);
 
@@ -725 +728 @@
         }
         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;
@@ -888 +891 @@
     php_stream     *stream;
     xc_hash_value_t hv;
+    ulong           old_rsid = EG(regular_list).nNextFreeElement;
 
     stream = php_stream_open_wrapper(xce->name.str.val, "rb", USE_PATH | REPORT_ERRORS | ENFORCE_SAFE_MODE | STREAM_DISABLE_OPEN_BASEDIR, NULL);
@@ -901 +905 @@
 
     php_stream_close(stream);
+    if (EG(regular_list).nNextFreeElement = old_rsid + 1) {
+        EG(regular_list).nNextFreeElement = old_rsid;
+    }
 
     if (n < 0) {