fix(worker): reset ini and session: support PHP8.2

Author: xavierleune

frankenphp.c

@@ -77,21 +77,27 @@ __thread zval *os_environment = NULL;
 __thread HashTable *worker_ini_snapshot = NULL;
 
 /* Session user handler names (same structure as PS(mod_user_names)).
- * ps_create_sid, ps_validate_sid, ps_update_timestamp added in PHP 8.3 */
+ * In PHP 8.2, mod_user_names is a union with .name.ps_* access.
+ * In PHP 8.3+, mod_user_names is a direct struct with .ps_* access. */
 typedef struct {
   zval ps_open;
   zval ps_close;
   zval ps_read;
   zval ps_write;
   zval ps_destroy;
   zval ps_gc;
-#if PHP_VERSION_ID >= 80300
   zval ps_create_sid;
   zval ps_validate_sid;
   zval ps_update_timestamp;
-#endif
 } session_user_handlers;
 
+/* Macro to access PS(mod_user_names) handlers across PHP versions */
+#if PHP_VERSION_ID >= 80300
+#define PS_MOD_USER_NAMES(handler) PS(mod_user_names).handler
+#else
+#define PS_MOD_USER_NAMES(handler) PS(mod_user_names).name.handler
+#endif
+
 __thread session_user_handlers *worker_session_handlers_snapshot = NULL;
 
 void frankenphp_update_local_thread_context(bool is_worker) {
@@ -280,7 +286,7 @@ static void frankenphp_snapshot_session_handlers(void) {
   }
 
   /* Check if user session handlers are defined */
-  if (Z_ISUNDEF(PS(mod_user_names).ps_open)) {
+  if (Z_ISUNDEF(PS_MOD_USER_NAMES(ps_open))) {
     return; /* No user handlers to snapshot */
   }
 
@@ -290,12 +296,12 @@ static void frankenphp_snapshot_session_handlers(void) {
   }
 
   /* Copy each handler zval with incremented reference count */
-#define SNAPSHOT_HANDLER(name)                                                 \
-  if (!Z_ISUNDEF(PS(mod_user_names).name)) {                                   \
-    ZVAL_COPY(&worker_session_handlers_snapshot->name,                         \
-              &PS(mod_user_names).name);                                       \
+#define SNAPSHOT_HANDLER(handler)                                              \
+  if (!Z_ISUNDEF(PS_MOD_USER_NAMES(handler))) {                                \
+    ZVAL_COPY(&worker_session_handlers_snapshot->handler,                      \
+              &PS_MOD_USER_NAMES(handler));                                    \
   } else {                                                                     \
-    ZVAL_UNDEF(&worker_session_handlers_snapshot->name);                       \
+    ZVAL_UNDEF(&worker_session_handlers_snapshot->handler);                    \
   }
 
   SNAPSHOT_HANDLER(ps_open);
@@ -304,11 +310,9 @@ static void frankenphp_snapshot_session_handlers(void) {
   SNAPSHOT_HANDLER(ps_write);
   SNAPSHOT_HANDLER(ps_destroy);
   SNAPSHOT_HANDLER(ps_gc);
-#if PHP_VERSION_ID >= 80300
   SNAPSHOT_HANDLER(ps_create_sid);
   SNAPSHOT_HANDLER(ps_validate_sid);
   SNAPSHOT_HANDLER(ps_update_timestamp);
-#endif
 
 #undef SNAPSHOT_HANDLER
 }
@@ -320,13 +324,13 @@ static void frankenphp_restore_session_handlers(void) {
   }
 
   /* Restore each handler zval */
-#define RESTORE_HANDLER(name)                                                  \
-  if (!Z_ISUNDEF(worker_session_handlers_snapshot->name)) {                    \
-    if (!Z_ISUNDEF(PS(mod_user_names).name)) {                                 \
-      zval_ptr_dtor(&PS(mod_user_names).name);                                 \
+#define RESTORE_HANDLER(handler)                                               \
+  if (!Z_ISUNDEF(worker_session_handlers_snapshot->handler)) {                 \
+    if (!Z_ISUNDEF(PS_MOD_USER_NAMES(handler))) {                              \
+      zval_ptr_dtor(&PS_MOD_USER_NAMES(handler));                              \
     }                                                                          \
-    ZVAL_COPY(&PS(mod_user_names).name,                                        \
-              &worker_session_handlers_snapshot->name);                        \
+    ZVAL_COPY(&PS_MOD_USER_NAMES(handler),                                     \
+              &worker_session_handlers_snapshot->handler);                     \
   }
 
   RESTORE_HANDLER(ps_open);
@@ -335,11 +339,9 @@ static void frankenphp_restore_session_handlers(void) {
   RESTORE_HANDLER(ps_write);
   RESTORE_HANDLER(ps_destroy);
   RESTORE_HANDLER(ps_gc);
-#if PHP_VERSION_ID >= 80300
   RESTORE_HANDLER(ps_create_sid);
   RESTORE_HANDLER(ps_validate_sid);
   RESTORE_HANDLER(ps_update_timestamp);
-#endif
 
 #undef RESTORE_HANDLER
 }
@@ -355,9 +357,9 @@ static void frankenphp_cleanup_worker_state(void) {
 
   /* Free session handlers snapshot */
   if (worker_session_handlers_snapshot != NULL) {
-#define FREE_HANDLER(name)                                                     \
-  if (!Z_ISUNDEF(worker_session_handlers_snapshot->name)) {                    \
-    zval_ptr_dtor(&worker_session_handlers_snapshot->name);                    \
+#define FREE_HANDLER(handler)                                                  \
+  if (!Z_ISUNDEF(worker_session_handlers_snapshot->handler)) {                 \
+    zval_ptr_dtor(&worker_session_handlers_snapshot->handler);                 \
   }
 
     FREE_HANDLER(ps_open);
@@ -366,11 +368,9 @@ static void frankenphp_cleanup_worker_state(void) {
     FREE_HANDLER(ps_write);
     FREE_HANDLER(ps_destroy);
     FREE_HANDLER(ps_gc);
-#if PHP_VERSION_ID >= 80300
     FREE_HANDLER(ps_create_sid);
     FREE_HANDLER(ps_validate_sid);
     FREE_HANDLER(ps_update_timestamp);
-#endif
 
 #undef FREE_HANDLER