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/phar.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/phar.c')
| -rw-r--r-- | ext/phar/phar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c index f76735089a..770f1ceffe 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -1327,7 +1327,7 @@ int phar_create_or_parse_filename(char *fname, int fname_len, char *alias, int a if (!pphar) { pphar = &mydata; } -#if PHP_MAJOR_VERSION < 6 +#if PHP_API_VERSION < 20100412 if (PG(safe_mode) && (!php_checkuid(fname, NULL, CHECKUID_ALLOW_ONLY_FILE))) { return FAILURE; } @@ -1491,7 +1491,7 @@ int phar_open_from_filename(char *fname, int fname_len, char *alias, int alias_l } else if (error && *error) { return FAILURE; } -#if PHP_MAJOR_VERSION < 6 +#if PHP_API_VERSION < 20100412 if (PG(safe_mode) && (!php_checkuid(fname, NULL, CHECKUID_ALLOW_ONLY_FILE))) { return FAILURE; } @@ -2359,7 +2359,7 @@ int phar_open_executed_filename(char *alias, int alias_len, char **error TSRMLS_ FREE_ZVAL(halt_constant); -#if PHP_MAJOR_VERSION < 6 +#if PHP_API_VERSION < 20100412 if (PG(safe_mode) && (!php_checkuid(fname, NULL, CHECKUID_ALLOW_ONLY_FILE))) { return FAILURE; } |