summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli.c
diff options
context:
space:
mode:
authorSara Golemon <pollita@php.net>2017-01-09 16:07:33 -0800
committerSara Golemon <pollita@php.net>2017-01-09 16:07:33 -0800
commit69fbe3a9add21dfd2341472e2e702af5c150e98c (patch)
tree3f3e8979907e0554e475e02cc8aa6fca959d83be /sapi/cli/php_cli.c
parent69058f35f8045984cdea9cbe33891979a17a3c38 (diff)
parent7e49e8e7970b423968de7a53ea9a0796f4634276 (diff)
downloadphp-git-69fbe3a9add21dfd2341472e2e702af5c150e98c.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Fix open_basedir check for glob:// opendir wrapper
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions