summaryrefslogtreecommitdiff
path: root/main/php_globals.h
diff options
context:
space:
mode:
authorStig Bakken <ssb@php.net>2000-02-25 21:27:03 +0000
committerStig Bakken <ssb@php.net>2000-02-25 21:27:03 +0000
commitd23e5d837add8aa68b4376ff6c4b3ba6b201b894 (patch)
treea7317cc78c8a5e75eede50ed1043ca24a71bcf65 /main/php_globals.h
parent117087697414b89077b2485ed3796f62f75750f9 (diff)
downloadphp-git-d23e5d837add8aa68b4376ff6c4b3ba6b201b894.tar.gz
@- Implemented default_charset and default_mimetype config directives (Stig)
Implemented default_charset and default_mimetype configuration directives. Started implementing ticks in PHP.
Diffstat (limited to 'main/php_globals.h')
-rw-r--r--main/php_globals.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/php_globals.h b/main/php_globals.h
index b7d1b391a4..9c3ee04294 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -42,6 +42,7 @@ extern PHPAPI int core_globals_id;
extern ZEND_API struct _php_core_globals core_globals;
#endif
+struct _php_tick_function_entry;
struct _php_core_globals {
zend_bool magic_quotes_gpc;
@@ -83,9 +84,6 @@ struct _php_core_globals {
char *gpc_order;
char *variables_order;
- char *default_mimetype;
- char *default_charset;
-
zend_bool expose_php;
zend_bool track_vars;
@@ -100,6 +98,8 @@ struct _php_core_globals {
long max_execution_time;
unsigned char header_is_being_sent;
+
+ zend_llist tick_functions;
};