From: Stanislav Malyshev <stas@php.net>
Date: Mon, 20 May 2013 07:55:48 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac0aa5737e6eff93d1cf83d6a6b1c8f1227775c4;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #64660 - yyparse can return 2, not only 1

Conflicts:
	Zend/zend_language_scanner.c
---

ac0aa5737e6eff93d1cf83d6a6b1c8f1227775c4
diff --cc NEWS
index 95ef3dcce5,2dc8815f4d..2158504eb6
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,13 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.16
 +?? ??? 2013, PHP 5.5.0 Release Candidate 2
  
  - Core:
 -  . Fixed bug #64729 (compilation failure on x32). (Gustavo)
+   . Fixed bug #64660 (Segfault on memory exhaustion within function definition).
+     (Stas)
 -  . Fixed bug #64853 (Use of no longer available ini directives causes crash on
 -    TS build). (Anatol)
 +  . Fixed bug #64853 (Use of no longer available ini directives causes crash
 +    on TS build). (Anatol)
  
  - Fileinfo:
    . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol)