diff options
Diffstat (limited to 'main/php_globals.h')
| -rw-r--r-- | main/php_globals.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/main/php_globals.h b/main/php_globals.h index d77c3ed46b..a8f7dc2e43 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2017 The PHP Group | + | Copyright (c) 1997-2018 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -107,7 +107,12 @@ struct _php_core_globals { HashTable rfc1867_protected_variables; short connection_status; - short ignore_user_abort; + + /* In 7.1/7.2 branches, this was initially a short, + * maintain struct alignment with subsequent padding. + */ + zend_bool ignore_user_abort; + char ignore_user_abort_reserved_padding; unsigned char header_is_being_sent; @@ -147,7 +152,6 @@ struct _php_core_globals { char *disable_functions; char *disable_classes; zend_bool allow_url_include; - zend_bool exit_on_timeout; #ifdef PHP_WIN32 zend_bool com_initialized; #endif |