php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 10:12:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5'

Browse Source
This commit is contained in:
Xinchen Hui
2013-10-18 10:34:59 +08:00
parent 5e368b76ed db61685edf
commit 065bbeb83f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ext/phar/php_phar.h
View File

@@ -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 */

4
ext/phar/util.c
View File

@@ -932,9 +932,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;
}
/* }}} */