Browse Source
Remove padding just merged since 7.3 isn't released yet.
Also bump PHP_API_VERSION since the struct size has changed.
pull/2990/merge
Sara Golemon
9 years ago
No known key found for this signature in database
GPG Key ID: DBDB397470D12172
2 changed files with
1 additions and
6 deletions
-
main/php.h
-
main/php_globals.h
|
|
|
@ -26,7 +26,7 @@ |
|
|
|
#include <dmalloc.h> |
|
|
|
#endif |
|
|
|
|
|
|
|
#define PHP_API_VERSION 20170718 |
|
|
|
#define PHP_API_VERSION 20180123 |
|
|
|
#define PHP_HAVE_STREAMS |
|
|
|
#define YYDEBUG 0 |
|
|
|
#define PHP_DEFAULT_CHARSET "UTF-8" |
|
|
|
|
|
|
|
@ -106,12 +106,7 @@ 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; |
|
|
|
|
|
|
|
|
