diff options
| author | Sara Golemon <pollita@php.net> | 2018-01-23 11:11:37 -0500 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2018-01-23 11:11:37 -0500 |
| commit | 0c22cda951826b238f431ba5c10d6ae6e6a7156b (patch) | |
| tree | 4c925491c9f153b8b31efa0001e0731a5d0532da /main | |
| parent | 0067420049e204f06f6375922ee56dd4b6de7294 (diff) | |
| parent | 3ffdf6c088c689785e33f6947a2db42635c05baf (diff) | |
| download | php-git-0c22cda951826b238f431ba5c10d6ae6e6a7156b.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix alignment of PG struct cause by ignore_user_abort big endian fix
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_globals.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/php_globals.h b/main/php_globals.h index c677a9e29c..5b499cad65 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -106,7 +106,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; |