php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove ext/spl dependency from ext/session (#21060)

Browse Source 
This is a follow-up of 668606816f
(GH-21001).

The SPL extension is no longer needed to be listed among dependencies.
The https://bugs.php.net/53141 is tested in
ext/session/tests/bug53141.phpt.

Additionally:
- Added missing inclusion guards to Zend/zend_autoload.h
This commit is contained in:
Peter Kokot
2026-01-28 17:25:40 +01:00
committed by GitHub
parent 62c94b6926
commit 65fd4d83bc
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Zend/zend_autoload.h
View File

@@ -16,6 +16,9 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
#ifndef _ZEND_AUTOLOAD_H
#define _ZEND_AUTOLOAD_H
#include "zend_string.h" #include "zend_string.h"
#include "zend_hash.h" #include "zend_hash.h"
#include "zend_API.h" #include "zend_API.h"
@@ -28,3 +31,5 @@ ZEND_API void zend_autoload_fcc_map_to_callable_zval_map(zval *return_value);
/* Only for deprecated strange behaviour of spl_autoload_unregister() */ /* Only for deprecated strange behaviour of spl_autoload_unregister() */
ZEND_API void zend_autoload_clean_class_loaders(void); ZEND_API void zend_autoload_clean_class_loaders(void);
void zend_autoload_shutdown(void); void zend_autoload_shutdown(void);
#endif

2
ext/session/config.m4
View File

@@ -20,8 +20,6 @@ if test "$PHP_SESSION" != "no"; then
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1]) [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
PHP_ADD_EXTENSION_DEP(session, date) PHP_ADD_EXTENSION_DEP(session, date)
dnl https://bugs.php.net/53141
PHP_ADD_EXTENSION_DEP(session, spl, true)
PHP_SUBST([SESSION_SHARED_LIBADD]) PHP_SUBST([SESSION_SHARED_LIBADD])
PHP_INSTALL_HEADERS([ext/session], [php_session.h mod_files.h mod_user.h]) PHP_INSTALL_HEADERS([ext/session], [php_session.h mod_files.h mod_user.h])

2
ext/session/config.w32
View File

@@ -5,8 +5,6 @@ ARG_ENABLE("session", "session support", "yes");
if (PHP_SESSION == "yes") { if (PHP_SESSION == "yes") {
EXTENSION("session", "mod_user_class.c session.c mod_files.c mod_user.c", false /* never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); EXTENSION("session", "mod_user_class.c session.c mod_files.c mod_user.c", false /* never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
ADD_EXTENSION_DEP('session', 'date'); ADD_EXTENSION_DEP('session', 'date');
// https://bugs.php.net/53141
ADD_EXTENSION_DEP('session', 'spl', true);
AC_DEFINE("HAVE_PHP_SESSION", 1, "Define to 1 if the PHP extension 'session' is available."); AC_DEFINE("HAVE_PHP_SESSION", 1, "Define to 1 if the PHP extension 'session' is available.");
PHP_INSTALL_HEADERS("ext/session", "php_session.h mod_files.h mod_user.h"); PHP_INSTALL_HEADERS("ext/session", "php_session.h mod_files.h mod_user.h");
} }

11
ext/session/session.c
View File

@@ -1527,7 +1527,7 @@ static bool php_can_change_session_setting(const char *setting_name, bool check_
return false; return false;
} }
if (SG(headers_sent) && (!check_cookies || PS(use_cookies))) { if (SG(headers_sent) && (!check_cookies || PS(use_cookies))) {
char error_msg[256]; char error_msg[256];
snprintf(error_msg, sizeof(error_msg), "Session %s cannot be changed after headers have already been sent", setting_name); snprintf(error_msg, sizeof(error_msg), "Session %s cannot be changed after headers have already been sent", setting_name);
@@ -1535,7 +1535,7 @@ static bool php_can_change_session_setting(const char *setting_name, bool check_
return false; return false;
} }
return true; return true;
} }
@@ -3055,11 +3055,6 @@ static PHP_MINFO_FUNCTION(session)
DISPLAY_INI_ENTRIES(); DISPLAY_INI_ENTRIES();
} }
static const zend_module_dep session_deps[] = {
ZEND_MOD_OPTIONAL("spl")
ZEND_MOD_END
};
/* ************************ /* ************************
* Upload hook handling * * Upload hook handling *
************************ */ ************************ */
@@ -3347,7 +3342,7 @@ static zend_result php_session_rfc1867_callback(unsigned int event, void *event_
zend_module_entry session_module_entry = { zend_module_entry session_module_entry = {
STANDARD_MODULE_HEADER_EX, STANDARD_MODULE_HEADER_EX,
NULL, NULL,
session_deps, NULL,
"session", "session",
ext_functions, ext_functions,
PHP_MINIT(session), PHP_MSHUTDOWN(session), PHP_MINIT(session), PHP_MSHUTDOWN(session),