Changeset 220 for trunk

Show
Ignore:
Timestamp:
10/07/2006 06:13:59 AM (7 years ago)
Author:
moo
Message:

cacher: correct the fix [199] [196] for #36. was breaking testcase Zend/tests/bug28442.phpt

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/processor/head.m4

    r217 r220  
    251251    const zend_class_entry *src = processor->active_class_entry_src; 
    252252    if (src->parent) { 
    253         zval **srczv; 
    254         if (zend_u_hash_quick_find(CE_STATIC_MEMBERS(src), BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength, b->h, (void **) &srczv) == SUCCESS) { 
     253        zval **parentzv; 
     254        if (zend_u_hash_quick_find(CE_STATIC_MEMBERS(src->parent), BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength, b->h, (void **) &parentzv) == SUCCESS) { 
    255255            zval **zv = (zval **) b->pData; 
    256             if (*srczv == *zv) { 
     256            if (*parentzv == *zv) { 
    257257                return ZEND_HASH_APPLY_REMOVE; 
    258258            }