]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorSara Golemon <pollita@php.net>
Tue, 10 Jan 2017 00:08:08 +0000 (16:08 -0800)
committerSara Golemon <pollita@php.net>
Tue, 10 Jan 2017 00:08:08 +0000 (16:08 -0800)
* PHP-7.0:
  Fix open_basedir check for glob:// opendir wrapper

1  2 
main/streams/glob_wrapper.c

Simple merge