more fixes for PHAR_G(cwd)

1 files changed, 14 insertions, 5 deletions

diff --git a/ext/phar/util.c b/ext/phar/util.c
index c006fb47a4..fed3b2b6ca 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -236,11 +236,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(entry);