diff options
| -rwxr-xr-x | UPGRADING | 2 | ||||
| -rw-r--r-- | ext/phar/php_phar.h | 1 | ||||
| -rw-r--r-- | ext/phar/util.c | 4 |
3 files changed, 4 insertions, 3 deletions
@@ -343,6 +343,8 @@ None - Intl: - This extension now requires ICU 4.0+. +- Phar: + - Added ability of resolving alias created by Phar::map ======================================== 9. New Global Constants diff --git a/ext/phar/php_phar.h b/ext/phar/php_phar.h index 4146e28f77..f8325d0c63 100644 --- a/ext/phar/php_phar.h +++ b/ext/phar/php_phar.h @@ -34,7 +34,6 @@ extern zend_module_entry phar_module_entry; #define PHP_PHAR_API PHPAPI #endif -#define PHAR_HAVE_RESOLVE_ALIAS PHP_PHAR_API int phar_resolve_alias(char *alias, int alias_len, char **filename, int *filename_len TSRMLS_DC); #endif /* PHP_PHAR_H */ diff --git a/ext/phar/util.c b/ext/phar/util.c index e9f1b1673c..dc4508f91c 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1190,9 +1190,9 @@ PHP_PHAR_API int phar_resolve_alias(char *alias, int alias_len, char **filename, if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_alias_map), alias, alias_len, (void**)&fd_ptr)) { *filename = (*fd_ptr)->fname; *filename_len = (*fd_ptr)->fname_len; - return 1; + return SUCCESS; } - return 0; + return FAILURE; } /* }}} */ |