Merge pull request #1 from jvoisin/pr1

pr for fetching upstream

1 files changed, 12 insertions, 15 deletions

diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index 74af0ed..30f6b3d 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -1,11 +1,3 @@
-#ifdef PHP_WIN32
-#include "win32/glob.h"
-#else
-#include <glob.h>
-#endif
-
-#include "zend_smart_str.h"
-
 #include "php_snuffleupagus.h"
 
 #ifndef ZEND_EXT_API
@@ -262,7 +254,7 @@ PHP_MINFO_FUNCTION(snuffleupagus) {
 #define ADD_ASSOC_ZSTR(arr, key, zstr) if (zstr) { add_assoc_str(arr, key, zstr); } else { add_assoc_null(arr, key); }
 #define ADD_ASSOC_REGEXP(arr, key, regexp) if (regexp && regexp->pattern) { add_assoc_str(arr, key, regexp->pattern); } else { add_assoc_null(arr, key); }
 
-static void add_df_to_arr(zval *arr, sp_disabled_function *df) {
+static void add_df_to_arr(zval *arr, sp_disabled_function const *const df) {
   zval arr_df;
   array_init(&arr_df);
 
@@ -375,7 +367,7 @@ static void dump_config() {
   if (splist) { \
     zval arr_sp; \
     array_init(&arr_sp); \
-    for (sp_list_node *p = splist; p; p = p->next) { add_next_index_str(&arr_sp, p->data); } \
+    for (const sp_list_node *p = splist; p; p = p->next) { add_next_index_str(&arr_sp, p->data); } \
     add_assoc_zval(arr, key, &arr_sp); \
   } else { add_assoc_null(arr, key); }
 
@@ -391,6 +383,8 @@ static void dump_config() {
 
   ADD_ASSOC_SPLIST(&arr, SP_TOKEN_ALLOW_WRAPPERS, SPCFG(wrapper).whitelist);
 
+#undef ADD_ASSOC_SPLIST
+
   add_assoc_bool(&arr, SP_TOKEN_INI_PROTECTION "." SP_TOKEN_ENABLE, SPCFG(ini).enable);
   add_assoc_bool(&arr, SP_TOKEN_INI_PROTECTION "." SP_TOKEN_SIM, SPCFG(ini).simulation);
   add_assoc_bool(&arr, SP_TOKEN_INI_PROTECTION "." "policy_ro", SPCFG(ini).policy_readonly);
@@ -402,7 +396,7 @@ static void dump_config() {
     zval arr_ini;
     array_init(&arr_ini);
 
-    sp_ini_entry *sp_entry;
+    const sp_ini_entry *sp_entry;
     ZEND_HASH_FOREACH_PTR(SPCFG(ini).entries, sp_entry)
       zval arr_ini_entry;
       array_init(&arr_ini_entry);
@@ -428,7 +422,7 @@ static void dump_config() {
     array_init(&arr_cookies);
 
     sp_cookie *cookie;
-    sp_list_node *p = SPCFG(cookie).cookies;
+    const sp_list_node *p = SPCFG(cookie).cookies;
     for (; p; p = p->next) {
       zval arr_cookie;
       array_init(&arr_cookie);
@@ -452,7 +446,8 @@ static void dump_config() {
   zval arr_dfs;
   array_init(&arr_dfs);
   size_t num_df = 0;
-  sp_list_node *dflist, *dfp;
+  const sp_list_node *dflist;
+  const sp_list_node *dfp;
   ZEND_HASH_FOREACH_PTR(SPCFG(disabled_functions), dflist)
     for (dfp = dflist; dfp; dfp = dfp->next) {
       add_df_to_arr(&arr_dfs, dfp->data);
@@ -608,12 +603,14 @@ static PHP_INI_MH(OnUpdateConfiguration) {
     (SPCFG(disabled_functions_ret) && zend_hash_num_elements(SPCFG(disabled_functions_ret)));
 
   if (SPCFG(show_old_php_warning) && getenv("SP_SKIP_OLD_PHP_CHECK") == NULL) {
-    time_t ts = time(NULL);
+    const time_t ts = time(NULL);
     if ((PHP_VERSION_ID < 70300) ||
         (PHP_VERSION_ID < 70400 && ts >= (time_t)1638745200L) ||
         (PHP_VERSION_ID < 80000 && ts >= (time_t)1669590000L) ||
         (PHP_VERSION_ID < 80100 && ts >= (time_t)1700953200L)) {
-      sp_log_warn("End-of-Life Check", "Your PHP version '" PHP_VERSION "' is not officially mainained anymore. Please upgrade as soon as possible. - Note: This message can be switched off by setting 'sp.global.show_old_php_warning.disable();' in your rules file or by setting the environment variable SP_SKIP_OLD_PHP_CHECK=1.");
+      sp_log_warn("End-of-Life Check", "Your PHP version '" PHP_VERSION "' is not officially maintained anymore. " \
+                      "Please upgrade as soon as possible. - Note: This message can be switched off by setting " \
+                      "'sp.global.show_old_php_warning.disable();' in your rules file or by setting the environment variable SP_SKIP_OLD_PHP_CHECK=1.");
     }
   }
   return SUCCESS;