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

* 'master' of https://git.php.net/push/php-src: (6215 commits)
  Extra comma
  Moved proxy object support in ASSIGN_ADD (and family) from VM to slow paths of corresponding operators
  Simplification
  zend_get_property_info_quick() cleanup and optimization
  initialize lineno before calling compile file file in phar
  Use ADDREF instead of DUP, it must be enough.
  Removed old irrelevant comment
  fixed compilation error
  Fix bug #68262: Broken reference across cloned objects
  export functions needed for phpdbg
  Fixed compilation
  Optimized property access handlers. Removed EG(std_property_info).
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  Don't make difference between undefined and unaccessible properies when call __get() and family
  Don't make useless CSE
  array_pop/array_shift optimization
  check for zlib headers as well as lib for mysqlnd
  a realpath cache key can be int or float, catching this
  News entry for new curl constants
  News entry for new curl constants
  ...

1 files changed, 17 insertions, 13 deletions

diff --git a/main/php_globals.h b/main/php_globals.h
index fa2fe3b232..a60efe69de 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -56,7 +56,7 @@ typedef struct _arg_separators {
 struct _php_core_globals {
 	zend_bool implicit_flush;
 
-	long 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;
-	long serialize_precision;
+	zend_long serialize_precision;
 
-	long memory_limit;
-	long 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;
-	long      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;
-	long upload_max_filesize;
+	zend_long upload_max_filesize;
 	
 	char *error_append_string;
 	char *error_prepend_string;
@@ -96,6 +96,10 @@ struct _php_core_globals {
 	char *auto_prepend_file;
 	char *auto_append_file;
 
+	char *input_encoding;
+	char *internal_encoding;
+	char *output_encoding;
+
 	arg_separators arg_separator;
 
 	char *variables_order;
@@ -109,7 +113,7 @@ struct _php_core_globals {
 
 	zend_llist tick_functions;
 
-	zval *http_globals[6];
+	zval http_globals[6];
 
 	zend_bool expose_php;
 
@@ -122,7 +126,7 @@ struct _php_core_globals {
 	zend_bool html_errors;
 	zend_bool xmlrpc_errors;
 
-	long xmlrpc_error_number;
+	zend_long xmlrpc_error_number;
 
 	zend_bool activated_auto_globals[8];
 
@@ -145,12 +149,12 @@ struct _php_core_globals {
 #ifdef PHP_WIN32
 	zend_bool com_initialized;
 #endif
-	long max_input_nesting_level;
-	long max_input_vars;
+	zend_long max_input_nesting_level;
+	zend_long max_input_vars;
 	zend_bool in_user_include;
 
 	char *user_ini_filename;
-	long user_ini_cache_ttl;
+	zend_long user_ini_cache_ttl;
 
 	char *request_order;