Merge branch 'PHP-7.0'

* PHP-7.0:
  Revert "Fixed test ext/readline/tests/readline_read_history_error_001.phpt"
This commit is contained in:
Xinchen Hui 2016-02-29 15:10:23 +08:00
commit bb9fdd25bc

View File

@ -410,7 +410,7 @@ PHP_FUNCTION(readline_read_history)
return;
}
if (!arg || php_check_open_basedir(arg) != 0) {
if (arg && php_check_open_basedir(arg)) {
RETURN_FALSE;
}