]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Tue, 22 Oct 2019 14:53:24 +0000 (17:53 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 22 Oct 2019 14:53:24 +0000 (17:53 +0300)
* PHP-7.4:
  Allow loading FFI bindings through ffi.preload directive

1  2 
Zend/zend_compile.h
ext/ffi/ffi.c
ext/ffi/php_ffi.h
ext/opcache/ZendAccelerator.c

Simple merge
diff --cc ext/ffi/ffi.c
Simple merge
Simple merge
index bcbbb2eb4287afe46e45a38382c9306a778d2dce,704e1c38d9b75dc02f089a44160cd5cc04ff09ac..12dd8aba7aee677f94d5690cca0148158279c5c1
@@@ -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