]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Thu, 5 Nov 2015 18:51:18 +0000 (19:51 +0100)
committerAnatol Belski <ab@php.net>
Thu, 5 Nov 2015 18:51:18 +0000 (19:51 +0100)
commite240df14203ee311114d914d2f92269e27e83177
tree222eff908d235f1d9bd2be98d0877226ed6e3cda
parentac711075acf0649d76ac932fb89cfbd193ff4a49
parent1184f0aca5a4fafc893f131f6012dc44cf5846c4
Merge branch 'PHP-7.0'

* PHP-7.0:
  add test for bug #70861
  Fix setting of empty string resource.
  fix possible NULL deref in image functions