diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2014-01-30 14:16:47 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2014-01-30 14:16:47 +0900 |
| commit | 53e302356605c75673bed00037b94a11d6dcd8fc (patch) | |
| tree | 3190e377ec073e314bedab4dde0b401d7a8a4b3e | |
| parent | 43432c12f176d42d35c82345caef23fb016cec82 (diff) | |
| parent | b1c0614eccda844ab505cd4d2ba90dac671d1737 (diff) | |
| download | php-git-53e302356605c75673bed00037b94a11d6dcd8fc.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug data->fd not set to -1 for open_basedir failure.
| -rw-r--r-- | ext/session/mod_files.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 4d5a18b36b..47140436e7 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -145,10 +145,12 @@ static void ps_files_open(ps_files *data, const char *key TSRMLS_DC) if (fstat(data->fd, &sbuf)) { close(data->fd); + data->fd = -1; return; } if (S_ISLNK(sbuf.st_mode) && php_check_open_basedir(buf TSRMLS_CC)) { close(data->fd); + data->fd = -1; return; } } |