summaryrefslogtreecommitdiff
path: root/main/php_globals.h
diff options
context:
space:
mode:
authorSara Golemon <pollita@php.net>2018-01-23 11:06:34 -0500
committerSara Golemon <pollita@php.net>2018-01-23 11:06:34 -0500
commit3ffdf6c088c689785e33f6947a2db42635c05baf (patch)
treee42285be0c9c321f2c71524987675284631b08a1 /main/php_globals.h
parente954bafc285e97cbdb9718b4cf2de77feaed3771 (diff)
downloadphp-git-3ffdf6c088c689785e33f6947a2db42635c05baf.tar.gz
Fix alignment of PG struct cause by ignore_user_abort big endian fix
Diffstat (limited to 'main/php_globals.h')
-rw-r--r--main/php_globals.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/php_globals.h b/main/php_globals.h
index 82eefb779f..a8f7dc2e43 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -107,7 +107,12 @@ struct _php_core_globals {
HashTable rfc1867_protected_variables;
short connection_status;
+
+ /* 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;