Merge remote-tracking branch 'sektioneins/master'

1 files changed, 46 insertions, 5 deletions

diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h
index 9ed67e6..8dc7ccb 100644
--- a/src/php_snuffleupagus.h
+++ b/src/php_snuffleupagus.h
@@ -1,9 +1,9 @@
 #ifndef PHP_SNUFFLEUPAGUS_H
 #define PHP_SNUFFLEUPAGUS_H
 
-#define PHP_SNUFFLEUPAGUS_VERSION "0.7.1"
+#define PHP_SNUFFLEUPAGUS_VERSION "0.8.0"
 #define PHP_SNUFFLEUPAGUS_EXTNAME "snuffleupagus"
-#define PHP_SNUFFLEUPAGUS_AUTHOR "NBS System & Julien (jvoisin) Voisin"
+#define PHP_SNUFFLEUPAGUS_AUTHOR "NBS System & Julien (jvoisin) Voisin & SektionEins GmbH"
 #define PHP_SNUFFLEUPAGUS_URL "https://github.com/jvoisin/snuffleupagus"
 #define PHP_SNUFFLEUPAGUS_COPYRIGHT "LGPLv2"
 
@@ -65,10 +65,12 @@ typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
 #define SP_CONFIG_INVALID 0
 #define SP_CONFIG_NONE -1
 
+#include "sp_php_compat.h"
 #include "sp_pcre_compat.h"
 #include "sp_list.h"
 #include "sp_tree.h"
 #include "sp_var_parser.h"
+#include "sp_config_scanner.h"
 #include "sp_config.h"
 #include "sp_config_utils.h"
 #include "sp_config_keywords.h"
@@ -85,6 +87,8 @@ typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
 #include "sp_session.h"
 #include "sp_sloppy.h"
 #include "sp_wrapper.h"
+#include "sp_ini.h"
+#include "sp_ifilter.h"
 
 extern zend_module_entry snuffleupagus_module_entry;
 #define phpext_snuffleupagus_ptr &snuffleupagus_module_entry
@@ -102,10 +106,45 @@ extern zend_module_entry snuffleupagus_module_entry;
 #endif
 
 ZEND_BEGIN_MODULE_GLOBALS(snuffleupagus)
-size_t in_eval;
-sp_config config;
-int is_config_valid;  // 1 = valid, 0 = invalid, -1 = none
+// sp_config config;
+// --- snuffleupagus config
+sp_config_random config_random;
+sp_config_sloppy config_sloppy;
+sp_config_unserialize config_unserialize;
+sp_config_readonly_exec config_readonly_exec;
+sp_config_upload_validation config_upload_validation;
+sp_config_cookie config_cookie;
+sp_config_auto_cookie_secure config_auto_cookie_secure;
+sp_config_global_strict config_global_strict;
+sp_config_xxe_protection config_xxe_protection;
+sp_config_eval config_eval;
+sp_config_wrapper config_wrapper;
+sp_config_session config_session;
+sp_config_ini config_ini;
+char config_log_media;
+u_long config_max_execution_depth;
+bool config_server_encode;
+bool config_server_strip;
+zend_string *config_encryption_key;
+zend_string *config_cookies_env_var;
+bool config_show_old_php_warning;
+
+HashTable *config_disabled_functions;
+HashTable *config_disabled_functions_hooked;
+HashTable *config_disabled_functions_ret;
+HashTable *config_disabled_functions_ret_hooked;
+sp_config_disabled_functions config_disabled_functions_reg;
+sp_config_disabled_functions config_disabled_functions_reg_ret;
+
+bool hook_execute;
+
+// --- ini options
 bool allow_broken_configuration;
+
+// --- runtime/state variables
+int is_config_valid;  // 1 = valid, 0 = invalid, -1 = none
+size_t in_eval;
+u_long execution_depth;
 HashTable *disabled_functions_hook;
 HashTable *sp_internal_functions_hook;
 HashTable *sp_eval_blacklist_functions_hook;
@@ -113,6 +152,8 @@ ZEND_END_MODULE_GLOBALS(snuffleupagus)
 
 ZEND_EXTERN_MODULE_GLOBALS(snuffleupagus)
 #define SNUFFLEUPAGUS_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(snuffleupagus, v)
+#define SPG(v) SNUFFLEUPAGUS_G(v)
+#define SPCFG(v) SPG(config_##v)
 
 #if defined(ZTS) && defined(COMPILE_DL_SNUFFLEUPAGUS)
 ZEND_TSRMLS_CACHE_EXTERN()