Browse Source

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix alignment of PG struct cause by ignore_user_abort big endian fix
pull/2990/merge
Sara Golemon 9 years ago
parent
commit
76b63ed149
  1. 5
      main/php_globals.h

5
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;

Loading…
Cancel
Save