diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-01-08 15:13:40 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-01-08 15:13:40 +0100 |
| commit | 10a2c0d574be62be1f0224d23909e27e74c87445 (patch) | |
| tree | f82712d29314dbc2805d91bca28d6b3852775eca | |
| parent | f4142a92b2ecfa0fdf89ec83bb41c2a46b299973 (diff) | |
| parent | 2fb7cd30c59345838588ba89ad8b05cc4c34d6dd (diff) | |
| download | php-git-10a2c0d574be62be1f0224d23909e27e74c87445.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- fix bug #47358, glob returns error, should be empty array()
- NEWS entry for #50524
| -rw-r--r-- | ext/standard/dir.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/standard/dir.c b/ext/standard/dir.c index ef28e9feaf..55326dbdd3 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -492,9 +492,7 @@ PHP_FUNCTION(glob) if (!globbuf.gl_pathc || !globbuf.gl_pathv) { no_results: if (PG(open_basedir) && *PG(open_basedir)) { - struct stat s; - - if (0 != VCWD_STAT(pattern, &s) || S_IFDIR != (s.st_mode & S_IFMT)) { + if (php_check_open_basedir_ex(pattern, 0 TSRMLS_CC)) { RETURN_FALSE; } } |