]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorYasuo Ohgaki <yohgaki@php.net>
Thu, 30 Jan 2014 05:16:47 +0000 (14:16 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Thu, 30 Jan 2014 05:16:47 +0000 (14:16 +0900)
* PHP-5.5:
  Fixed bug data->fd not set to -1 for open_basedir failure.


Trivial merge