From 54c352c1b5aa08b187dd1e52e544709cad2b0fee Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Thu, 23 Sep 2021 12:23:40 +0200
Subject: config is stack allocated now + some code improvements (see details)

* for easier memory manegement, the entire sp_config struct was merged into snuffleupagus_globals and allocated on stack where possible
* SNUFFLEUPAGUS_G() can be written as SPG(), which is faster to type and easier to read
* execution_depth is re-initialized to 0 for each request
* function calls with inline string and length parameters consistently use ZEND_STRL instead of sizeof()-1
* execution is actually hooked if recursion protection is enabled
* some line breaks were removed to make the code more readable
---
 src/sp_cookie_encryption.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/sp_cookie_encryption.c')

diff --git a/src/sp_cookie_encryption.c b/src/sp_cookie_encryption.c
index 7bcedd2..b2cff66 100644
--- a/src/sp_cookie_encryption.c
+++ b/src/sp_cookie_encryption.c
@@ -1,7 +1,7 @@
 #include "php_snuffleupagus.h"
 
 static inline const sp_cookie *sp_lookup_cookie_config(const zend_string *key) {
-  const sp_list_node *it = SNUFFLEUPAGUS_G(config).config_cookie->cookies;
+  const sp_list_node *it = SPCFG(cookie).cookies;
 
   while (it) {
     const sp_cookie *config = it->data;
@@ -133,11 +133,11 @@ PHP_FUNCTION(sp_setcookie) {
   }
 
   /* If the request was issued over HTTPS, the cookie should be "secure" */
-  if (SNUFFLEUPAGUS_G(config).config_auto_cookie_secure) {
+  if (SPCFG(auto_cookie_secure).enable) {
     const zval server_vars = PG(http_globals)[TRACK_VARS_SERVER];
     if (Z_TYPE(server_vars) == IS_ARRAY) {
       const zval *is_https =
-          zend_hash_str_find(Z_ARRVAL(server_vars), "HTTPS", strlen("HTTPS"));
+          zend_hash_str_find(Z_ARRVAL(server_vars), ZEND_STRL("HTTPS"));
       if (NULL != is_https) {
         secure = 1;
       }
-- 
cgit v1.3