com php-src: Merge branch 'PHP-7.4': Zend/zend_compile.h ext/ffi/ffi.c ext/ffi/php_ffi.h ext/opcache/ZendAccel erator.c
| From: | Dmitry Stogov | Date: | Tue, 22 Oct 2019 14:53:24 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': Zend/zend_compile.h ext/ffi/ffi.c ext/ffi/php_ffi.h ext/opcache/ZendAccel erator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109005@lists.php.net to get a copy of this message | ||
Commit: 626a5837c06061497b6db5f57612ed26777c2c8c
Author: Dmitry Stogov <dmitry@zend.com> Tue, 22 Oct 2019 17:53:24 +0300
Parents: e6d3146bdc943ead15209c4070a51a35abc99167 1417352dda354c22db43a8d4dbaa967575e2720c
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=626a5837c06061497b6db5f57612ed26777c2c8c
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
Allow loading FFI bindings through ffi.preload directive
Changed paths:
MM Zend/zend_compile.h
MM ext/ffi/ffi.c
MM ext/ffi/php_ffi.h
MM ext/opcache/ZendAccelerator.c
Diff:
diff --cc ext/opcache/ZendAccelerator.c
index bcbbb2eb428,704e1c38d9b..12dd8aba7ae
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -4546,15 -4485,16 +4540,16 @@@ static int accel_finish_startup(void
int rc;
int orig_error_reporting;
- int (*orig_activate)(TSRMLS_D) = sapi_module.activate;
- int (*orig_deactivate)(TSRMLS_D) = sapi_module.deactivate;
- void (*orig_register_server_variables)(zval *track_vars_array TSRMLS_DC) =
sapi_module.register_server_variables;
- int (*orig_header_handler)(sapi_header_struct *sapi_header, sapi_header_op_enum op,
sapi_headers_struct *sapi_headers TSRMLS_DC) = sapi_module.header_handler;
- int (*orig_send_headers)(sapi_headers_struct *sapi_headers TSRMLS_DC) =
sapi_module.send_headers;
- void (*orig_send_header)(sapi_header_struct *sapi_header, void *server_context TSRMLS_DC)=
sapi_module.send_header;
- char *(*orig_getenv)(char *name, size_t name_len TSRMLS_DC) = sapi_module.getenv;
+ int (*orig_activate)() = sapi_module.activate;
+ int (*orig_deactivate)() = sapi_module.deactivate;
+ void (*orig_register_server_variables)(zval *track_vars_array) =
sapi_module.register_server_variables;
+ int (*orig_header_handler)(sapi_header_struct *sapi_header, sapi_header_op_enum op,
sapi_headers_struct *sapi_headers) = sapi_module.header_handler;
+ int (*orig_send_headers)(sapi_headers_struct *sapi_headers) = sapi_module.send_headers;
+ void (*orig_send_header)(sapi_header_struct *sapi_header, void *server_context)=
sapi_module.send_header;
+ char *(*orig_getenv)(char *name, size_t name_len) = sapi_module.getenv;
size_t (*orig_ub_write)(const char *str, size_t str_length) = sapi_module..ub_write;
void (*orig_flush)(void *server_context) = sapi_module.flush;
+ uint32_t orig_compiler_options = CG(compiler_options);
#ifdef ZEND_SIGNALS
zend_bool old_reset_signals = SIGG(reset);
#endif