--- embedaddon/php/main/php_globals.h	2012/02/21 23:48:05	1.1.1.1
+++ embedaddon/php/main/php_globals.h	2012/05/29 12:34:35	1.1.1.2
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_globals.h,v 1.1.1.1 2012/02/21 23:48:05 misho Exp $ */
+/* $Id: php_globals.h,v 1.1.1.2 2012/05/29 12:34:35 misho Exp $ */
 
 #ifndef PHP_GLOBALS_H
 #define PHP_GLOBALS_H
@@ -54,19 +54,10 @@ typedef struct _arg_separators {
 } arg_separators;
 
 struct _php_core_globals {
-	zend_bool magic_quotes_gpc;
-	zend_bool magic_quotes_runtime;
-	zend_bool magic_quotes_sybase;
-
-	zend_bool safe_mode;
-
-	zend_bool allow_call_time_pass_reference;
 	zend_bool implicit_flush;
 
 	long output_buffering;
 
-	char *safe_mode_include_dir;
-	zend_bool safe_mode_gid;
 	zend_bool sql_safe_mode;
 	zend_bool enable_dl;
 
@@ -75,8 +66,6 @@ struct _php_core_globals {
 	char *unserialize_callback_func;
 	long serialize_precision;
 
-	char *safe_mode_exec_dir;
-
 	long memory_limit;
 	long max_input_time;
 
@@ -95,6 +84,7 @@ struct _php_core_globals {
 	char *include_path;
 	char *open_basedir;
 	char *extension_dir;
+	char *php_binary;
 
 	char *upload_tmp_dir;
 	long upload_max_filesize;
@@ -122,13 +112,9 @@ struct _php_core_globals {
 
 	zend_bool expose_php;
 
-	zend_bool register_globals;
-	zend_bool register_long_arrays;
 	zend_bool register_argc_argv;
 	zend_bool auto_globals_jit;
 
-	zend_bool y2k_compliance;
-
 	char *docref_root;
 	char *docref_ext;
 
@@ -143,6 +129,7 @@ struct _php_core_globals {
 	zend_bool file_uploads;
 	zend_bool during_request_startup;
 	zend_bool allow_url_fopen;
+	zend_bool enable_post_data_reading;
 	zend_bool always_populate_raw_post_data;
 	zend_bool report_zend_debug;
 
@@ -159,6 +146,7 @@ struct _php_core_globals {
 	zend_bool com_initialized;
 #endif
 	long max_input_nesting_level;
+	long max_input_vars;
 	zend_bool in_user_include;
 
 	char *user_ini_filename;
@@ -174,8 +162,6 @@ struct _php_core_globals {
 #ifdef PHP_WIN32
 	zend_bool windows_show_crt_warning;
 #endif
-
-	long max_input_vars;
 };