diff options
| author | Sara Golemon <pollita@php.net> | 2018-01-23 08:58:53 -0500 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2018-01-23 08:58:53 -0500 |
| commit | 871066523e8c6dc33cb4448d675cfa50cc183e43 (patch) | |
| tree | 9d33a93a5cc913b07dbb17829f789888ce46c58c /main/php_globals.h | |
| parent | 4626c28e9c167be56fe12a5ccb500fc88dec55f5 (diff) | |
| parent | d46d53a7bcc99bb8d993852ef84e7a83d703f3db (diff) | |
| download | php-git-871066523e8c6dc33cb4448d675cfa50cc183e43.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
Diffstat (limited to 'main/php_globals.h')
| -rw-r--r-- | main/php_globals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_globals.h b/main/php_globals.h index 735313e89f..c677a9e29c 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -106,7 +106,7 @@ struct _php_core_globals { HashTable rfc1867_protected_variables; short connection_status; - short ignore_user_abort; + zend_bool ignore_user_abort; unsigned char header_is_being_sent; |