Skip to content

Commit e172bc2

Browse files
committed
Fix windows for real now
1 parent 0d7a139 commit e172bc2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ext/phar/util.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,7 @@ zend_result phar_mount_entry(phar_archive_data *phar, char *filename, size_t fil
208208
is_phar = (filename_len > 7 && !memcmp(filename, "phar://", 7));
209209

210210
entry.phar = phar;
211-
#ifdef PHP_WIN32
212-
entry.filename = zend_string_separate(entry.filename, false);
213-
phar_unixify_path_separators(ZSTR_VAL(entry.filename), path_len);
214-
#endif
211+
215212
if (is_phar) {
216213
entry.tmp = estrndup(filename, filename_len);
217214
} else {
@@ -238,6 +235,9 @@ zend_result phar_mount_entry(phar_archive_data *phar, char *filename, size_t fil
238235
}
239236

240237
entry.filename = zend_string_init(path, path_len, false);
238+
#ifdef PHP_WIN32
239+
phar_unixify_path_separators(ZSTR_VAL(entry.filename), path_len);
240+
#endif
241241

242242
if (ssb.sb.st_mode & S_IFDIR) {
243243
entry.is_dir = 1;

0 commit comments

Comments
 (0)