Changeset 11163ab in git


Ignore:
Timestamp:
2012-04-05T13:54:52Z (8 years ago)
Author:
Xuefer <xuefer@…>
Parents:
cbc552b (diff), 9c4d039 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

tagged 2.0.0 rc1

git-svn-id: svn://svn.lighttpd.net/xcache/tags/2.0.0-rc1@890 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rd619e39 rc62db2e  
    1212 * fixed #55: segv php tokenizer on certain special situation
    1313 * compiler errors: all compiler warning (E_STRICT only currently) is now cached and is supported for user handler
     14 * tests/bug52160.phpt: report multiple error correctly
    1415
    15161.3.3 2012-?-?
    1617========
    1718 * fix constant name handling (possible SIGSEGV)
    18  * tests/bug52160.phpt: report multiple error correctly
    1919
    20201.3.2 2011-06-04
  • NEWS

    rd619e39 r159b8ed  
    44 * correct __FILE__ __DIR__ supported for hardlinked files
    55
    6 1.3.2 2012-?-?
     61.3.3 2012-?-?
    77========
    8  * stability fix for prior PHP_5_4
     8 * stability fix for PHP_5_3 and before
    99
    10101.3.2 2011-06-04
  • xcache.c

    r538b695 r9c4d039  
    930930        path_buffer_len = snprintf(path_buffer, MAXPATHLEN, "%s/%s", path, filepath);
    931931        if (path_buffer_len < MAXPATHLEN - 1) {
    932             if (xstat_func(path_buffer, path_buffer_len, data)) {
     932            if (xstat_func(path_buffer, path_buffer_len, data TSRMLS_CC)) {
    933933                ret = 1;
    934934                goto finish;
     
    952952                        path_buffer_len = dirname_len + filename_len;
    953953                        path_buffer[path_buffer_len] = '\0';
    954                         if (xstat_func(path_buffer, path_buffer_len, data) == 0) {
     954                        if (xstat_func(path_buffer, path_buffer_len, data TSRMLS_CC) == 0) {
    955955                            ret = 1;
    956956                            goto finish;
     
    979979static int xc_include_path_stat(const char *filepath, char *path_buffer, struct stat *pbuf TSRMLS_DC) /* {{{ */
    980980{
    981     return xc_include_path_apply(filepath, path_buffer, xc_stat_file, (void *) pbuf TSRMLS_DC)
     981    return xc_include_path_apply(filepath, path_buffer, xc_stat_file, (void *) pbuf TSRMLS_CC)
    982982        ? SUCCESS
    983983        : FAILURE;
     
    10151015    entry_find_include_path_data.stored_entry = stored_entry;
    10161016
    1017     return xc_include_path_apply(filepath, path_buffer, xc_entry_find_include_path_func_unlocked, (void *) &entry_find_include_path_data TSRMLS_DC)
     1017    return xc_include_path_apply(filepath, path_buffer, xc_entry_find_include_path_func_unlocked, (void *) &entry_find_include_path_data TSRMLS_CC)
    10181018        ? SUCCESS
    10191019        : FAILURE;
     
    10761076    else {
    10771077#ifdef ZEND_ENGINE_2_3
    1078         char *opened_path = php_resolve_path(compiler->filename, compiler->filename_len, PG(include_path));
     1078        char *opened_path = php_resolve_path(compiler->filename, compiler->filename_len, PG(include_path) TSRMLS_CC);
    10791079        if (opened_path) {
    10801080            strcpy(compiler->opened_path_buffer, opened_path);
Note: See TracChangeset for help on using the changeset viewer.