php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix cwd test in php 5.2, now all tests pass in 5.2 on unix

Browse Source
This commit is contained in:
Greg Beaver
2008-04-30 23:06:57 +00:00
parent c3816a2aa0
commit 2b8a56779b
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ext/phar/util.c
View File

@@ -309,11 +309,20 @@ char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_d
efree(entry);
try_len = filename_len;
test = phar_fix_filepath(estrndup(filename, filename_len), &try_len, 1 TSRMLS_CC);
if (zend_hash_exists(&((*pphar)->manifest), test + 1, try_len - 1)) {
spprintf(&ret, 0, "phar://%s%s", arch, test);
efree(arch);
efree(test);
return ret;
if (*test == '/') {
if (zend_hash_exists(&((*pphar)->manifest), test + 1, try_len - 1)) {
spprintf(&ret, 0, "phar://%s%s", arch, test);
efree(arch);
efree(test);
return ret;
}
} else {
if (zend_hash_exists(&((*pphar)->manifest), test, try_len)) {
spprintf(&ret, 0, "phar://%s/%s", arch, test);
efree(arch);
efree(test);
return ret;
}
}
efree(test);
}