summaryrefslogtreecommitdiff
path: root/src/snuffleupagus.c
diff options
context:
space:
mode:
authorjvoisin2022-12-07 21:02:22 +0100
committerjvoisin2022-12-08 20:55:46 +0100
commitccfaf3e4713b1878241f1235a6fcb66ad0582d47 (patch)
tree97dcd84aed33b1d98095d0cf3f467e9dfb975f0c /src/snuffleupagus.c
parent5966fefb9a291bd0eecd0fff9396b2b6cea4a62e (diff)
Add unserialize_noclass
Diffstat (limited to 'src/snuffleupagus.c')
-rw-r--r--src/snuffleupagus.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index be6240e..8454fc1 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -332,6 +332,8 @@ static void dump_config() {
332 array_init(&arr); 332 array_init(&arr);
333 add_assoc_string(&arr, "version", PHP_SNUFFLEUPAGUS_VERSION); 333 add_assoc_string(&arr, "version", PHP_SNUFFLEUPAGUS_VERSION);
334 334
335 add_assoc_bool(&arr, SP_TOKEN_UNSERIALIZE_NOCLASS "." SP_TOKEN_ENABLE, SPCFG(unserialize_noclass).enable);
336
335 add_assoc_bool(&arr, SP_TOKEN_UNSERIALIZE_HMAC "." SP_TOKEN_ENABLE, SPCFG(unserialize).enable); 337 add_assoc_bool(&arr, SP_TOKEN_UNSERIALIZE_HMAC "." SP_TOKEN_ENABLE, SPCFG(unserialize).enable);
336 add_assoc_bool(&arr, SP_TOKEN_UNSERIALIZE_HMAC "." SP_TOKEN_SIM, SPCFG(unserialize).simulation); 338 add_assoc_bool(&arr, SP_TOKEN_UNSERIALIZE_HMAC "." SP_TOKEN_SIM, SPCFG(unserialize).simulation);
337 ADD_ASSOC_ZSTR(&arr, SP_TOKEN_UNSERIALIZE_HMAC "." SP_TOKEN_DUMP, SPCFG(unserialize).dump); 339 ADD_ASSOC_ZSTR(&arr, SP_TOKEN_UNSERIALIZE_HMAC "." SP_TOKEN_DUMP, SPCFG(unserialize).dump);
@@ -562,10 +564,8 @@ static PHP_INI_MH(OnUpdateConfiguration) {
562 hook_session(); 564 hook_session();
563 } 565 }
564 566
565 if (NULL != SPCFG(encryption_key)) { 567 if ((NULL != SPCFG(encryption_key) && SPCFG(unserialize).enable) || SPCFG(unserialize_noclass).enable) {
566 if (SPCFG(unserialize).enable) { 568 hook_serialize();
567 hook_serialize();
568 }
569 } 569 }
570 570
571 hook_execute(); 571 hook_execute();