From bd00fe81cc4525b7d8e5c36a3844ee2254e5f69c Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Wed, 26 Jul 2017 13:19:41 +0200
Subject: [PATCH] Fixed bug #74833, SID constant created with wrong module
 number

---
 ext/session/session.c           |  7 ++++++-
 ext/session/tests/bug74833.phpt | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 ext/session/tests/bug74833.phpt

diff --git a/ext/session/session.c b/ext/session/session.c
index 2c4b30fc2b..daea59c4ff 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -98,6 +98,9 @@ zend_class_entry *php_session_update_timestamp_iface_entry;
 
 static void php_session_send_cookie(void);
 
+/* Initialized in MINIT, readonly otherwise. */
+static int my_module_number = 0;
+
 /* Dispatched by RINIT and by php_session_destroy */
 static inline void php_rinit_session_globals(void) /* {{{ */
 {
@@ -108,6 +111,7 @@ static inline void php_rinit_session_globals(void) /* {{{ */
 	PS(mod_user_is_open) = 0;
 	PS(define_sid) = 1;
 	PS(session_vars) = NULL;
+	PS(module_number) = my_module_number;
 	ZVAL_UNDEF(&PS(http_session_vars));
 }
 /* }}} */
@@ -2730,7 +2734,8 @@ static PHP_MINIT_FUNCTION(session) /* {{{ */
 
 	zend_register_auto_global(zend_string_init("_SESSION", sizeof("_SESSION") - 1, 1), 0, NULL);
 
-	PS(module_number) = module_number; /* if we really need this var we need to init it in zts mode as well! */
+	my_module_number = module_number;
+	PS(module_number) = module_number;
 
 	PS(session_status) = php_session_none;
 	REGISTER_INI_ENTRIES();
diff --git a/ext/session/tests/bug74833.phpt b/ext/session/tests/bug74833.phpt
new file mode 100644
index 0000000000..5a0eda71f7
--- /dev/null
+++ b/ext/session/tests/bug74833.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #74833 Session module number is uninitialized when SID is reset
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+
+ob_start();
+
+session_start();
+session_regenerate_id();
+$c = get_defined_constants(true);
+/* Ensure the SID constant has correct module number. */
+var_dump(isset($c['session']['SID']));
+
+ob_end_flush();
+?>
+==DONE==
+--EXPECTF--
+bool(true)
+==DONE==
+
-- 
2.40.0