Changeset 449 for branches/1.2

Show
Ignore:
Timestamp:
07/12/2007 02:32:54 AM (17 months ago)
Author:
moo
Message:

fix compiling state after compiling non cachable files, thanks PatrickDK

Location:
branches/1.2
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2/ChangeLog

    r447 r449  
    111.2.2 2007-?-? 
    22== ChangeLog == 
     3 * bug fix for compatibility with Zend Optimizer and other non-cachable 
    34 * #55: segv php tokenizer on certain special situation 
    45 

  • branches/1.2/NEWS

    r447 r449  
    111.2.2 2007-?-? 
    22======== 
     3 * bug fix for compatibility with Zend Optimizer and other non-cachable 
    34 * a rare segv bug with token_get_all 
    45 

  • branches/1.2/xcache.c

    r446 r449  
    967967    if (!XG(initial_compile_file_called)) { 
    968968        xc_sandbox_free(&sandbox, XC_InstallNoBinding TSRMLS_CC); 
    969         return op_array; 
    970     } 
     969        ENTER_LOCK(cache) { 
     970            cache->compiling = 0; 
     971        } LEAVE_LOCK(cache); 
     972        return op_array; 
     973    } 
    971974 
    972975    filename = h->opened_path ? h->opened_path : h->filename;