Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  stop warnings from unused opcode map
  - BFN

diff --cc NEWS
index 7714f3104975266ccf0fef754cfc3dfc7f6767f1,e7c7639cbc3be9b06980fa8e2069582c30ed7556..81cd742733a983e98ba5713fe1aea6a60df91c3f
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -30,14 -26,11 +30,18 @@@ PH
  - GD:
    . Fixed bug #64405 (Use freetype-config for determining freetype2 dir(s)).
      (Adam)
+     
+ - PDO_odbc:
+   . Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries). 
+     (michael at orlitzky dot com)
  
 +- MySQLi:
 +  . Fixed bug #65486 (mysqli_poll() is broken on win x64). (Anatol)
 +
 +- OPCache:
 +  . Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
 +    (Dmitry)
 +
  - SNMP:
    . Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
  

diff --cc Zend/zend_language_scanner.c
index deb799ab763b2f28be85f6cb32e52fa2c2f3e083,2b25ae7eb12c230687c88165f5d1466ac0172903..62183cdfc192460c98389859dea023f9b67cbcfe
--- 1/Zend/zend_language_scanner.c
--- 2/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 */
 -/* Generated by re2c 0.13.5 on Sun Jun 16 14:52:22 2013 */
++/* Generated by re2c 0.13.5 on Sun Dec 22 13:03:33 2013 */
  #line 1 "Zend/zend_language_scanner.l"
  /*
     +----------------------------------------------------------------------+

diff --cc Zend/zend_language_scanner_defs.h
index 5926e3c61d971615174d2f61216148cca197e370,5c30d3dd9bbc7a38fb60c3d8d7d35adf36380c84..70ce8b890c4d03ea73b9f93e6768cf24e001079e
--- 1/Zend/zend_language_scanner_defs.h
--- 2/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 */
 -/* Generated by re2c 0.13.5 on Sun Jun 16 14:52:22 2013 */
++/* Generated by re2c 0.13.5 on Sun Dec 22 13:03:33 2013 */
  #line 3 "Zend/zend_language_scanner_defs.h"
  
  enum YYCONDTYPE {

diff --cc Zend/zend_vm_gen.php
Simple merge

diff --cc Zend/zend_vm_opcodes.c
index c565510facd1adef0eaceebfb58a1d23ca7e1db3,1195dc38bff1d2325d79392516386c6b976ecb33..22fc7cbcf3d32ee1ba6c1431c6533b4fc34ab94b
--- 1/Zend/zend_vm_opcodes.c
--- 2/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@@ -19,8 -19,9 +19,9 @@@
  */
  
  #include <stdio.h>
+ #include <zend.h>
  
 -const char *zend_vm_opcodes_map[159] = {
 +const char *zend_vm_opcodes_map[164] = {
        "ZEND_NOP",
        "ZEND_ADD",
        "ZEND_SUB",
@@@ -180,9 -181,8 +181,13 @@@
        "ZEND_SEPARATE",
        "ZEND_QM_ASSIGN_VAR",
        "ZEND_JMP_SET_VAR",
 +      "ZEND_DISCARD_EXCEPTION",
 +      "ZEND_YIELD",
 +      "ZEND_GENERATOR_RETURN",
 +      "ZEND_FAST_CALL",
 +      "ZEND_FAST_RET",
  };
+ 
+ ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) {
+       return zend_vm_opcodes_map[opcode];
+ }

diff --cc Zend/zend_vm_opcodes.h
index b6f4cfc897653e175a3b902ae97546bfbcbcd649,f9a165bd42eba6d1fc47fa48fe917afa9905fc7c..aa917c18b2d31ecb360bc3286559ca418acbb517
--- 1/Zend/zend_vm_opcodes.h
--- 2/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@@ -164,10 -164,5 +164,10 @@@ ZEND_API const char *zend_get_opcode_na
  #define ZEND_SEPARATE                        156
  #define ZEND_QM_ASSIGN_VAR                   157
  #define ZEND_JMP_SET_VAR                     158
 +#define ZEND_DISCARD_EXCEPTION               159
 +#define ZEND_YIELD                           160
 +#define ZEND_GENERATOR_RETURN                161
 +#define ZEND_FAST_CALL                       162
 +#define ZEND_FAST_RET                        163
  
--#endif
++#endif