Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (1132 commits)
  Micro optimizations for isset/empty
  Micro optimization for zend_hash_next_index_insert_new()
  Fix array_keys() on $GLOBALS
  Fix procedural finfo calls in methods
  Fix allocator for 64bit zend_long with 32bit long
  Use intptr_t for zend_intptr_t typedef
  Fix format strings in zend_alloc
  Drop zend_long64 in favor of int64_t
  Removed deprecated fields
  NEWS
  cleanup NEWS
  removing the NEWS entry as we had to revert this fix for now
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"
  Revert "fix TS build"
  Revert "Merge branch 'PHP-5.4' into PHP-5.5"
  Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
  Revert "Bug #41631: Fix regression from first attempt (6569db8)"
  NEWS
  Fixed Bug #65171 imagescale() fails
  Fixed bug #68234
  ...

1 files changed, 11 insertions, 11 deletions

diff --git a/main/php_globals.h b/main/php_globals.h
index defb220c76..a60efe69de 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
    | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
@@ -56,7 +56,7 @@ typedef struct _arg_separators {
 struct _php_core_globals {
 	zend_bool implicit_flush;
 
-	zend_int_t output_buffering;
+	zend_long output_buffering;
 
 	zend_bool sql_safe_mode;
 	zend_bool enable_dl;
@@ -64,16 +64,16 @@ struct _php_core_globals {
 	char *output_handler;
 
 	char *unserialize_callback_func;
-	zend_int_t serialize_precision;
+	zend_long serialize_precision;
 
-	zend_int_t memory_limit;
-	zend_int_t max_input_time;
+	zend_long memory_limit;
+	zend_long max_input_time;
 
 	zend_bool track_errors;
 	zend_bool display_errors;
 	zend_bool display_startup_errors;
 	zend_bool log_errors;
-	zend_int_t      log_errors_max_len;
+	zend_long      log_errors_max_len;
 	zend_bool ignore_repeated_errors;
 	zend_bool ignore_repeated_source;
 	zend_bool report_memleaks;
@@ -88,7 +88,7 @@ struct _php_core_globals {
 	char *sys_temp_dir;
 
 	char *upload_tmp_dir;
-	zend_int_t upload_max_filesize;
+	zend_long upload_max_filesize;
 	
 	char *error_append_string;
 	char *error_prepend_string;
@@ -126,7 +126,7 @@ struct _php_core_globals {
 	zend_bool html_errors;
 	zend_bool xmlrpc_errors;
 
-	zend_int_t xmlrpc_error_number;
+	zend_long xmlrpc_error_number;
 
 	zend_bool activated_auto_globals[8];
 
@@ -149,12 +149,12 @@ struct _php_core_globals {
 #ifdef PHP_WIN32
 	zend_bool com_initialized;
 #endif
-	zend_int_t max_input_nesting_level;
-	zend_int_t max_input_vars;
+	zend_long max_input_nesting_level;
+	zend_long max_input_vars;
 	zend_bool in_user_include;
 
 	char *user_ini_filename;
-	zend_int_t user_ini_cache_ttl;
+	zend_long user_ini_cache_ttl;
 
 	char *request_order;