mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-14 04:16:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ZTS build (again), kill unused var

Browse Source
This commit is contained in:
Steph Fox 2008-02-18 04:51:04 +00:00
parent ba9fcf62fc
commit 335e57e443
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/phar/phar.c
View File

@ -2574,7 +2574,7 @@ int phar_zend_open(const char *filename, zend_file_handle *handle TSRMLS_DC) /*
if (!(entry = phar_find_in_include_path(entry, old, *pphar TSRMLS_CC))) {
/* this file is not in the phar, use the original path */
if (SUCCESS == phar_orig_zend_open(filename, handle TSRMLS_CC)) {
if (SUCCESS == phar_mount_entry(*pphar, handle->opened_path ? handle->opened_path : (char *) filename, strlen(handle->opened_path ? handle->opened_path : filename), (char *) filename, strlen(filename))) {
if (SUCCESS == phar_mount_entry(*pphar, handle->opened_path ? handle->opened_path : (char *) filename, strlen(handle->opened_path ? handle->opened_path : filename), (char *) filename, strlen(filename) TSRMLS_CC)) {
entry = (char *) filename;
goto dopharthing;
}

1
ext/phar/util.c
View File

@ -78,7 +78,6 @@ int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len,
phar_entry_info entry = {0};
php_stream_statbuf ssb;
const char *err;
int is_dir;
if (phar_path_check(&path, &path_len, &err) > pcr_is_ok) {
return FAILURE;