diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-26 23:55:03 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-26 23:55:03 +0000 |
| commit | cb3033080017e05ae7843859f993517252e67e31 (patch) | |
| tree | 675f409de0e4180a660cfe03df518c06aa18d847 /ext/phar/util.c | |
| parent | 64f372fae2876a197996a1753d3659d8fa9d0bb4 (diff) | |
| download | php-git-cb3033080017e05ae7843859f993517252e67e31.tar.gz | |
Merge safe_mode changes into extensions that are in sync in both branches
Diffstat (limited to 'ext/phar/util.c')
| -rw-r--r-- | ext/phar/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/phar/util.c b/ext/phar/util.c index 0aa2bd7bb9..985d9ac541 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -201,7 +201,7 @@ int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len, entry.tmp = estrndup(filename, filename_len); } } -#if PHP_MAJOR_VERSION < 6 +#if PHP_API_VERSION < 20100412 if (PG(safe_mode) && !is_phar && (!php_checkuid(entry.tmp, NULL, CHECKUID_CHECK_FILE_AND_DIR))) { efree(entry.tmp); efree(entry.filename); @@ -850,7 +850,7 @@ int phar_open_archive_fp(phar_archive_data *phar TSRMLS_DC) /* {{{ */ if (phar_get_pharfp(phar TSRMLS_CC)) { return SUCCESS; } -#if PHP_MAJOR_VERSION < 6 +#if PHP_API_VERSION < 20100412 if (PG(safe_mode) && (!php_checkuid(phar->fname, NULL, CHECKUID_ALLOW_ONLY_FILE))) { return FAILURE; } |