1
0
Fork 0

<=PHP_5_2 duplicate error message failed to include file

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@956 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
This commit is contained in:
Xuefer 2012-07-06 19:09:47 +00:00
parent 5689b6b09c
commit dabdfe1dc5
2 changed files with 3 additions and 2 deletions

View File

@ -5,6 +5,7 @@ ChangeLog
* fixed #281: subsequenc request segv when timeout happens during compiling
* admin/ config changed. please update accordingly
* WIN32: kill invalidate CRT parameters on shutdown
* fixed: <=PHP_5_2 duplicate error message failed to include file
2.0.0 2012-04-20
Ini Settings Changes

View File

@ -976,7 +976,7 @@ static zend_bool xc_resolve_path(const char *filepath, char *path_buffer, xc_res
memcpy(path_buffer + dirname_len, filepath, filename_len);
path_buffer_len = dirname_len + filename_len;
path_buffer[path_buffer_len] = '\0';
if (checker_func(path_buffer, path_buffer_len, data TSRMLS_CC) == 0) {
if (checker_func(path_buffer, path_buffer_len, data TSRMLS_CC)) {
ret = 1;
goto finish;
}
@ -987,7 +987,7 @@ static zend_bool xc_resolve_path(const char *filepath, char *path_buffer, xc_res
}
}
ret = FAILURE;
ret = 0;
finish:
my_free_alloca(paths, use_heap);