Changeset 680 in svn


Ignore:
Timestamp:
2009-09-07T10:12:24+02:00 (6 years ago)
Author:
Xuefer
Message:

merged r679 from trunk
--此行及以下内容将会被忽略--

_M 1.3
M 1.3/utils.c
M 1.3/xcache.c

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 679
  • branches/1.3/utils.c

    r677 r680  
    533533static zend_bool xc_auto_global_callback(char *name, uint name_len TSRMLS_DC) /* {{{ */
    534534{
    535     zend_auto_global *auto_global;
    536     if (zend_u_hash_find(CG(auto_globals), UG(unicode) ? IS_UNICODE : IS_STRING, ZSTR(name), name_len + 1, (void **) &auto_global) == FAILURE) {
    537         return 1;
    538     }
    539535    return 0;
    540536}
  • branches/1.3/xcache.c

    r676 r680  
    703703    for (i = 0; i < p->autoglobal_cnt; i ++) {
    704704        xc_autoglobal_t *aginfo = &p->autoglobals[i];
    705         /*
    706         zend_auto_global *auto_global;
    707         if (zend_u_hash_quick_find(CG(auto_globals), aginfo->type, aginfo->key, aginfo->key_len+1, aginfo->h, (void **) &auto_global)==SUCCESS) {
    708             if (auto_global->armed) {
    709                 auto_global->armed = auto_global->auto_global_callback(auto_global->name, auto_global->name_len TSRMLS_CC);
    710             }
    711         }
    712         */
    713705        zend_u_is_auto_global(aginfo->type, aginfo->key, aginfo->key_len TSRMLS_CC);
    714706    }
Note: See TracChangeset for help on using the changeset viewer.