]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 30 Dec 2014 09:26:18 +0000 (01:26 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 30 Dec 2014 09:26:53 +0000 (01:26 -0800)
commit4c0f17caca1fc0a9fab66ada9c43c960011308f0
tree87f64cb5f6faa05f5da665b6effc23db298bfd17
parent24125f0f26f3787c006e4a51611ba33ee3b841cb
parent71c970077d9ad46fc595095c50f211b3136d6459
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  FIx bug #68618 (out of bounds read crashes php-cgi)
  Fixed bug #68676 (Explicit Double Free)
NEWS
sapi/cgi/cgi_main.c