com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS Zend/zend_language_scanner.c Zend/zend_language_sca nner_defs.h Zend/zend_vm_gen.php
Zend/zend_vm _opcodes.c Zend/zend_vm_opcodes.h
| From: | Joe Watkins | Date: | Sun, 22 Dec 2013 13:07:41 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS Zend/zend_language_scanner.c Zend/zend_language_sca nner_defs.h Zend/zend_vm_gen.php Zend/zend_vm _opcodes.c Zend/zend_vm_opcodes.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75395@lists.php.net to get a copy of this message | ||
Commit: 247ec0d81f1ebe16cafa082ba3ef73ca1f31831d
Author: krakjoe <joe.watkins@live.co.uk> Sun, 22 Dec 2013 13:07:41 +0000
Parents: 8e36d36ee6dc89701416c282ede0bcd92fd3aa0e b1df00a7c98fb66cc801924287ebb73234999bfc
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=247ec0d81f1ebe16cafa082ba3ef73ca1f31831d
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
stop warnings from unused opcode map
- BFN
Changed paths:
MM NEWS
MM Zend/zend_language_scanner.c
MM Zend/zend_language_scanner_defs.h
MM Zend/zend_vm_gen.php
MM Zend/zend_vm_opcodes.c
MM Zend/zend_vm_opcodes.h
Diff:
diff --cc NEWS
index 7714f31,e7c7639..81cd742
--- a/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 deb799a,2b25ae7..62183cd
--- a/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 5926e3c,5c30d3d..70ce8b8
--- a/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_opcodes.c
index c565510,1195dc3..22fc7cb
--- a/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 b6f4cfc,f9a165b..aa917c1
--- a/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