]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 30 Dec 2014 09:25:30 +0000 (01:25 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 30 Dec 2014 09:26:00 +0000 (01:26 -0800)
commit71c970077d9ad46fc595095c50f211b3136d6459
tree711b42dcf81d052c9c50f291444143c3efb06182
parentfbf3a6bc1abcc8a5b5226b0ad9464c37f11ddbd6
parentf9ad3086693fce680fbe246e4a45aa92edd2ac35
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  FIx bug #68618 (out of bounds read crashes php-cgi)
NEWS
sapi/cgi/cgi_main.c