Browse Source

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug data->fd not set to -1 for open_basedir failure.
pull/579/head
Yasuo Ohgaki 12 years ago
parent
commit
53e3023566
  1. 2
      ext/session/mod_files.c

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

Loading…
Cancel
Save