diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
| commit | c2b90805e81de43b4fa28fa1b30ed255bfba76b2 (patch) | |
| tree | a353bb7b1cb958fd4f3e576ab44f3b6ef03a02c2 /main/php_globals.h | |
| parent | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (diff) | |
| parent | d0e84c6f4702dc5dda473851dd33c5e6cee82ee6 (diff) | |
| download | php-git-c2b90805e81de43b4fa28fa1b30ed255bfba76b2.tar.gz | |
Merge branch 'master' into openssl_error_store
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 |