Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug data->fd not set to -1 for open_basedir failure.
This commit is contained in:
Yasuo Ohgaki 2014-01-30 14:17:11 +09:00
commit 210b444e1d

View File

@ -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;
}
}