]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Tue, 9 Apr 2013 08:10:06 +0000 (12:10 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 9 Apr 2013 08:10:06 +0000 (12:10 +0400)
* 'master' of git.php.net:php-src:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)


Trivial merge