Changeset 680

Timestamp:

2009-09-07T10:12:24+02:00 (4 years ago)

Author:

moo

Message:

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

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

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• utils.c (modified) (1 diff)
• xcache.c (modified) (1 diff)

branches/1.3/utils.c

@@ -533 +533 @@
 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;
 }

branches/1.3/xcache.c

@@ -703 +703 @@
     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);
     }