Browse Source

merged r679 from trunk

--此行及以下内容将会被忽略--

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


git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.3@680 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
1.3
Xuefer 12 years ago
parent
commit
77d4500f84
  1. 4
      utils.c
  2. 8
      xcache.c

4
utils.c

@ -532,10 +532,6 @@ ZESW(xc_cest_t *, void) xc_install_class(char *filename, xc_cest_t *cest, int op
#ifdef ZEND_ENGINE_2_1
static zend_bool xc_auto_global_callback(char *name, uint name_len TSRMLS_DC) /* {{{ */
{
zend_auto_global *auto_global;
if (zend_u_hash_find(CG(auto_globals), UG(unicode) ? IS_UNICODE : IS_STRING, ZSTR(name), name_len + 1, (void **) &auto_global) == FAILURE) {
return 1;
}
return 0;
}
/* }}} */

8
xcache.c

@ -702,14 +702,6 @@ static zend_op_array *xc_entry_install(xc_entry_t *xce, zend_file_handle *h TSRM
/* trigger auto_globals jit */
for (i = 0; i < p->autoglobal_cnt; i ++) {
xc_autoglobal_t *aginfo = &p->autoglobals[i];
/*
zend_auto_global *auto_global;
if (zend_u_hash_quick_find(CG(auto_globals), aginfo->type, aginfo->key, aginfo->key_len+1, aginfo->h, (void **) &auto_global)==SUCCESS) {
if (auto_global->armed) {
auto_global->armed = auto_global->auto_global_callback(auto_global->name, auto_global->name_len TSRMLS_CC);
}
}
*/
zend_u_is_auto_global(aginfo->type, aginfo->key, aginfo->key_len TSRMLS_CC);
}
#endif

Loading…
Cancel
Save