diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
| commit | e63a8540a60e95aa5bd8e269add1b02afcc1b79b (patch) | |
| tree | b83a144eec24cc81adab0b9a778f7a730d8df79e /main/php_globals.h | |
| parent | 7a4cc73641bb3eb878f7184bcbd026ee663cf2a9 (diff) | |
| parent | 53071e647049f099f7f7a0771ddb63fc2cdd621c (diff) | |
| download | php-git-e63a8540a60e95aa5bd8e269add1b02afcc1b79b.tar.gz | |
Merge branch 'openssl_error_store' into openssl_aead
Diffstat (limited to 'main/php_globals.h')
| -rw-r--r-- | main/php_globals.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/main/php_globals.h b/main/php_globals.h index 057ec6679f..e50ea2ebfb 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -147,7 +147,6 @@ struct _php_core_globals { char *disable_functions; char *disable_classes; zend_bool allow_url_include; - zend_bool exit_on_timeout; #ifdef PHP_WIN32 zend_bool com_initialized; #endif |