diff options
| -rw-r--r-- | ext/phar/phar.c | 7 | ||||
| -rwxr-xr-x | ext/phar/phar_object.c | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 521bd69bde..386d11449b 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -1482,6 +1482,13 @@ int phar_split_fname(char *filename, int filename_len, char **arch, int *arch_le filename_len -= 7; } +#ifdef PHP_WIN32 + if (filename_len > 3 && *filename == '/' && *(filename + 2) == ':' && *(filename + 3) == '/') { + filename++; + filename_len--; + } +#endif + if (phar_detect_phar_fname_ext(filename, 0, &ext_str, &ext_len) == FAILURE) { return FAILURE; } diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 64b3a77f1c..684fd128d3 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -244,7 +244,16 @@ PHP_METHOD(Phar, __construct) phar_obj->arc.archive = phar_data; phar_obj->spl.oth_handler = &phar_spl_foreign_handler; +#ifdef PHP_WIN32 + /* check for drive filenames like C:/ and prepend / */ + if (fname_len > 2 && *(fname + 1) == ':' && *(fname + 2) == '/') { + fname_len = spprintf(&fname, 0, "phar:///%s", fname); + } else { + fname_len = spprintf(&fname, 0, "phar://%s", fname); + } +#else fname_len = spprintf(&fname, 0, "phar://%s", fname); +#endif INIT_PZVAL(&arg1); ZVAL_STRINGL(&arg1, fname, fname_len, 0); |