Changeset 726 for branches/1.3/xcache.c


Ignore:
Timestamp:
2011-04-09T14:59:31+02:00 (3 years ago)
Author:
moo
Message:

merge from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/xcache.c

    r701 r726  
    931931    xc_entry_data_php_t *php = (xc_entry_data_php_t *) data; 
    932932 
    933     class_name = opline->op1.u.constant.value.str.val; 
    934     class_len  = opline->op1.u.constant.value.str.len; 
     933    class_name = Z_OP_CONSTANT(opline->op1).value.str.val; 
     934    class_len  = Z_OP_CONSTANT(opline->op1).value.str.len; 
    935935    if (zend_hash_find(CG(class_table), class_name, class_len, (void **) &cest) == FAILURE) { 
    936936        assert(0); 
     
    24372437    } 
    24382438 
    2439     if (value->type == IS_CONSTANT) { 
     2439    switch ((Z_TYPE_P(value) & IS_CONSTANT_TYPE_MASK)) { 
     2440    case IS_CONSTANT: 
    24402441        *return_value = *value; 
    24412442        zval_copy_ctor(return_value); 
    24422443        return_value->type = UNISW(IS_STRING, UG(unicode) ? IS_UNICODE : IS_STRING); 
    2443         return; 
    2444     } 
    2445  
    2446     if (value->type == IS_CONSTANT_ARRAY) { 
     2444        break; 
     2445 
     2446    case IS_CONSTANT_ARRAY: 
    24472447        *return_value = *value; 
    24482448        zval_copy_ctor(return_value); 
    24492449        return_value->type = IS_ARRAY; 
    2450         return; 
    2451     } 
    2452  
    2453     RETURN_NULL(); 
     2450        break; 
     2451 
     2452    default: 
     2453        RETURN_NULL(); 
     2454    } 
    24542455} 
    24552456/* }}} */ 
     
    24782479} 
    24792480/* }}} */ 
    2480 static function_entry xcache_functions[] = /* {{{ */ 
     2481static zend_function_entry xcache_functions[] = /* {{{ */ 
    24812482{ 
    24822483    PHP_FE(xcache_count,             NULL) 
Note: See TracChangeset for help on using the changeset viewer.