Skip to content

Commit 0c22cda

Browse files
committed
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
2 parents 0067420 + 3ffdf6c commit 0c22cda

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

main/php_globals.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,12 @@ struct _php_core_globals {
106106
HashTable rfc1867_protected_variables;
107107

108108
short connection_status;
109+
110+
/* In 7.1/7.2 branches, this was initially a short,
111+
* maintain struct alignment with subsequent padding.
112+
*/
109113
zend_bool ignore_user_abort;
114+
char ignore_user_abort_reserved_padding;
110115

111116
unsigned char header_is_being_sent;
112117

0 commit comments

Comments
 (0)