]> granicus.if.org Git - php/commit
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)
commitc8758c91a709995c9292cb81a751649b5484d631
treefaac882f47e92f195fb5c0cc1510fc28e3392bc7
parent255ed92b343ce576f46f6e2788be3acf61b53d11
parenteb7d0ce3b0acfd9ce21f7ec7cd36f88c39aacad0
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)