Changeset 1376


Ignore:
Timestamp:
2013-09-21T05:48:47+02:00 (15 months ago)
Author:
moo
Message:

merge build fix from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mod_cacher/xc_cacher.c

    r1367 r1376  
    10191019        wrapper = php_stream_locate_url_wrapper(filepath, &path_for_open, 0 TSRMLS_CC);  
    10201020        if (wrapper && wrapper->wops->url_stat 
    1021          && wrapper != &php_plain_files_wrapper 
    1022          && wrapper->wops->url_stat(wrapper, path_for_open, PHP_STREAM_URL_STAT_QUIET, &ssb, NULL TSRMLS_CC) == SUCCESS) { 
     1021#ifdef ZEND_ENGINE_2 
     1022         && wrapper->wops->url_stat(wrapper, path_for_open, PHP_STREAM_URL_STAT_QUIET, &ssb, NULL TSRMLS_CC) == SUCCESS 
     1023#else 
     1024         && wrapper->wops->url_stat(wrapper, path_for_open, &ssb TSRMLS_CC) == SUCCESS 
     1025#endif 
     1026        ) { 
    10231027            *statbuf = ssb.sb; 
    10241028            return SUCCESS; 
     
    21792183     || !h->filename 
    21802184     || !SG(request_info).path_translated 
    2181  
    21822185    ) { 
    21832186        TRACE("%s", "cacher not enabled"); 
     
    22682271{ 
    22692272    xc_gc_op_array_t *op_array = (xc_gc_op_array_t *) pDest; 
    2270     zend_uint i; 
    22712273#ifdef ZEND_ENGINE_2 
    22722274    if (op_array->arg_info) { 
     2275        zend_uint i; 
    22732276        for (i = 0; i < op_array->num_args; i++) { 
    22742277            efree((char *) ZSTR_V(op_array->arg_info[i].name)); 
Note: See TracChangeset for help on using the changeset viewer.