Changeset 617 for branches/1.3/xcache.c


Ignore:
Timestamp:
2009-07-05T08:30:54+02:00 (5 years ago)
Author:
moo
Message:

PHP 5.3 support

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 485
  • branches/1.3/xcache.c

    r602 r617  
    542542    xc_entry_data_php_t *p = xce->data.php; 
    543543    zend_op_array *old_active_op_array = CG(active_op_array); 
     544    ALLOCA_FLAG(use_heap) 
     545 
    544546#ifndef ZEND_ENGINE_2 
    545547    /* new ptr which is stored inside CG(class_table) */ 
    546     xc_cest_t **new_cest_ptrs = (xc_cest_t **)do_alloca(sizeof(xc_cest_t*) * p->classinfo_cnt); 
     548    xc_cest_t **new_cest_ptrs = (xc_cest_t **)my_do_alloca(sizeof(xc_cest_t*) * p->classinfo_cnt, use_heap); 
    547549#endif 
    548550 
     
    605607 
    606608#ifndef ZEND_ENGINE_2 
    607     free_alloca(new_cest_ptrs); 
     609    my_free_alloca(new_cest_ptrs, use_heap); 
    608610#endif 
    609611    CG(active_op_array) = old_active_op_array; 
     
    649651    int size = strlen(include_path) + 1; 
    650652    char tokens[] = { DEFAULT_DIR_SEPARATOR, '\0' }; 
    651  
    652     paths = (char *)do_alloca(size); 
     653    ALLOCA_FLAG(use_heap) 
     654 
     655    paths = (char *)my_do_alloca(size, use_heap); 
    653656    memcpy(paths, include_path, size); 
    654657 
     
    658661        } 
    659662        if (VCWD_STAT(filepath, pbuf) == 0) { 
    660             free_alloca(paths); 
     663            my_free_alloca(paths, use_heap); 
    661664            return SUCCESS; 
    662665        } 
    663666    } 
    664667 
    665     free_alloca(paths); 
     668    my_free_alloca(paths, use_heap); 
    666669 
    667670    return FAILURE; 
Note: See TracChangeset for help on using the changeset viewer.