summaryrefslogtreecommitdiff
path: root/main/php_globals.h
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-05-29 18:45:06 +0000
committerZeev Suraski <zeev@php.net>2000-05-29 18:45:06 +0000
commit8fb954ae4fe5369acc845a4f801731352507de24 (patch)
tree48a42eb2fa9e52eb683092943f03c7746c913904 /main/php_globals.h
parent7213c743f085cf3842418a96fd848f8b93c4d387 (diff)
downloadphp-git-8fb954ae4fe5369acc845a4f801731352507de24.tar.gz
Fix startup sequence. It should do it this time.
Diffstat (limited to 'main/php_globals.h')
-rw-r--r--main/php_globals.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/main/php_globals.h b/main/php_globals.h
index 72418e141d..fb1550cb31 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -67,8 +67,8 @@ struct _php_core_globals {
zend_bool safe_mode;
zend_bool sql_safe_mode;
- char *safe_mode_exec_dir;
zend_bool enable_dl;
+ char *safe_mode_exec_dir;
long memory_limit;
@@ -97,14 +97,6 @@ struct _php_core_globals {
char *gpc_order;
char *variables_order;
- zend_bool expose_php;
-
- zend_bool track_vars;
- zend_bool register_globals;
- zend_bool register_argc_argv;
-
- zend_bool y2k_compliance;
-
short connection_status;
short ignore_user_abort;
@@ -115,6 +107,16 @@ struct _php_core_globals {
zend_llist tick_functions;
php_http_globals http_globals;
+
+ zend_bool expose_php;
+
+ zend_bool track_vars;
+ zend_bool register_globals;
+ zend_bool register_argc_argv;
+
+ zend_bool y2k_compliance;
+
+ zend_bool modules_activated;
};