From 5b5f99ef1877d4d77d188d86dd03874135f05c7b Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 24 Sep 2014 20:00:25 +0000 Subject: [PATCH 1/5] Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them. --- Zend/zend_float.h | 4 ++++ Zend/zend_vm.h | 4 ++++ Zend/zend_vm_opcodes.h | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/Zend/zend_float.h b/Zend/zend_float.h index 33f8e93fbf3..d9e4f4be88e 100644 --- a/Zend/zend_float.h +++ b/Zend/zend_float.h @@ -21,6 +21,8 @@ #ifndef ZEND_FLOAT_H #define ZEND_FLOAT_H +BEGIN_EXTERN_C() + /* Define functions for FP initialization and de-initialization. */ @@ -28,6 +30,8 @@ extern ZEND_API void zend_init_fpu(TSRMLS_D); extern ZEND_API void zend_shutdown_fpu(TSRMLS_D); extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D); +END_EXTERN_C() + /* Copy of the contents of xpfpa.h (which is under public domain) See http://wiki.php.net/rfc/rounding for details. diff --git a/Zend/zend_vm.h b/Zend/zend_vm.h index 078be15b743..e403e7cc928 100644 --- a/Zend/zend_vm.h +++ b/Zend/zend_vm.h @@ -21,9 +21,13 @@ #ifndef ZEND_VM_H #define ZEND_VM_H +BEGIN_EXTERN_C() + ZEND_API void zend_vm_use_old_executor(void); ZEND_API void zend_vm_set_opcode_handler(zend_op* opcode); +END_EXTERN_C() + #define ZEND_VM_SET_OPCODE_HANDLER(opline) zend_vm_set_opcode_handler(opline) #endif diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h index 4ed726d217f..89a1afad493 100644 --- a/Zend/zend_vm_opcodes.h +++ b/Zend/zend_vm_opcodes.h @@ -21,8 +21,12 @@ #ifndef ZEND_VM_OPCODES_H #define ZEND_VM_OPCODES_H +BEGIN_EXTERN_C() + ZEND_API const char *zend_get_opcode_name(zend_uchar opcode); +END_EXTERN_C() + #define ZEND_NOP 0 #define ZEND_ADD 1 #define ZEND_SUB 2 From 087150de95f8e356e44e07cebb842f6c507e987e Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Fri, 31 Oct 2014 10:09:14 -0700 Subject: [PATCH 2/5] Update NEWS after rebase. --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 9e5e1388c81..59922340197 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2014, PHP 5.5.20 +- Core: + . Fixed bug #68091 (Some Zend headers lack appropriate extern "C" blocks). + (Adam) + ?? ??? 2014, PHP 5.5.19 From 4bb836be207db33bb5ef69766f46acb60a554e30 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Fri, 31 Oct 2014 10:10:49 -0700 Subject: [PATCH 3/5] Update the VM generation script, per Bob. --- Zend/zend_vm_gen.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 08657e5f31e..41febfa44dc 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -1181,7 +1181,9 @@ function gen_vm($def, $skel) { out($f, $GLOBALS['header_text']); fputs($f, "#ifndef ZEND_VM_OPCODES_H\n#define ZEND_VM_OPCODES_H\n\n"); + fputs($f, "BEGIN_EXTERN_C()\n\n"); fputs($f, "ZEND_API const char *zend_get_opcode_name(zend_uchar opcode);\n\n"); + fputs($f, "END_EXTERN_C()\n\n"); foreach ($opcodes as $code => $dsc) { $code = str_pad((string)$code,$code_len," ",STR_PAD_LEFT); From 05394d6056d0798d8b34f90a4a043572e18b470f Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 23 Nov 2014 16:18:04 -0800 Subject: [PATCH 4/5] update NEWS --- NEWS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 8f8fff0b912..275de4dc0ce 100644 --- a/NEWS +++ b/NEWS @@ -4,7 +4,10 @@ PHP NEWS - Core: . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence) - . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly triggered). (Julien) + . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly + triggered). (Julien) + . Fixed bug #68091 (Some Zend headers lack appropriate extern "C" blocks). + (Adam) - FPM: . Fixed bug #68420 (listen=9000 listens to ipv6 localhost instead of all From 03dcf66f9a204a2158a266f5bb739295dfb73ee5 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Sun, 23 Nov 2014 16:21:53 -0800 Subject: [PATCH 5/5] fix NEWS order --- NEWS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 275de4dc0ce..1f83b03a4d8 100644 --- a/NEWS +++ b/NEWS @@ -3,20 +3,20 @@ PHP NEWS ?? ??? 2014, PHP 5.5.20 - Core: - . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence) - . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly - triggered). (Julien) . Fixed bug #68091 (Some Zend headers lack appropriate extern "C" blocks). (Adam) + . Fixed bug #68185 ("Inconsistent insteadof definition."- incorrectly + triggered). (Julien) + . Fixed bug #68370 ("unset($this)" can make the program crash). (Laruence) - FPM: + . Fixed bug #68381 (fpm_unix_init_main ignores log_level). + (David Zuelke, Remi) . Fixed bug #68420 (listen=9000 listens to ipv6 localhost instead of all addresses). (Remi) . Fixed bug #68421 (access.format='%R' doesn't log ipv6 address). (Remi) . Fixed bug #68423 (PHP-FPM will no longer load all pools). (Remi) . Fixed bug #68428 (listen.allowed_clients is IPv4 only). (Remi) - . Fixed bug #68381 (fpm_unix_init_main ignores log_level). - (David Zuelke, Remi) . Fixed bug #68452 (php-fpm man page is oudated). (Remi) . Fixed request #68458 (Change pm.start_servers default warning to notice). (David Zuelke, Remi)