Changeset 68

Show
Ignore:
Timestamp:
05/01/05 15:03:22 (4 years ago)
Author:
zoeloelip
Message:

Only include the last fix for zend engine 2

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • eaccelerator/trunk/loader.c

    r66 r68  
    836836  s = decode_lstr(&len, p, l); 
    837837  if (s != NULL) { 
     838#ifdef ZEND_ENGINE_2 
    838839        char* r; 
    839840        r = zend_str_tolower_dup(s, len); 
    840     if (zend_hash_find(CG(class_table), r, len+1, (void **)&to->parent) != SUCCESS) { 
    841 /*??? 
    842       debug_printf("[%d] EACCELERATOR can't restore parent class " 
    843           "\"%s\" of class \"%s\"\n", getpid(), s, to->name); 
    844 */ 
     841    if (zend_hash_find(CG(class_table), r, len+1, (void **)&to->parent) != SUCCESS) 
     842#else 
     843        if (zend_hash_find(CG(class_table), s, len+1, (void **)&to->parent) != SUCCESS) 
     844#endif 
     845        { 
    845846      to->parent = NULL; 
    846847    } else { 
    …… 
    863864#endif 
    864865    } 
     866#ifdef ZEND_ENGINE_2 
    865867        efree(r); 
     868#endif 
    866869    efree(s); 
    867870  }