archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4' into PHP-8.0

Browse source 
* PHP-7.4:
  Fix #80889: amendment
This commit is contained in:
Christoph M. Becker 2021-03-22 22:49:46 +01:00
commit 90be86fc91
2 changed files with 50 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ext/session/session.c
View file

@ -1952,12 +1952,23 @@ static int save_handler_check_session() {
return SUCCESS; return SUCCESS;
} }
static inline void set_user_save_handler_ini(void) {
zend_string *ini_name, *ini_val;
ini_name = zend_string_init("session.save_handler", sizeof("session.save_handler") - 1, 0);
ini_val = zend_string_init("user", sizeof("user") - 1, 0);
PS(set_handler) = 1;
zend_alter_ini_entry(ini_name, ini_val, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
PS(set_handler) = 0;
zend_string_release_ex(ini_val, 0);
zend_string_release_ex(ini_name, 0);
}
/* {{{ Sets user-level functions */ /* {{{ Sets user-level functions */
PHP_FUNCTION(session_set_save_handler) PHP_FUNCTION(session_set_save_handler)
{ {
zval *args = NULL; zval *args = NULL;
int i, num_args, argc = ZEND_NUM_ARGS(); int i, num_args, argc = ZEND_NUM_ARGS();
zend_string *ini_name, *ini_val;
if (argc > 0 && argc <= 2) { if (argc > 0 && argc <= 2) {
zval *obj = NULL; zval *obj = NULL;
@ -2052,13 +2063,7 @@ PHP_FUNCTION(session_set_save_handler)
} }
if (PS(session_status) != php_session_active && (!PS(mod) || PS(mod) != &ps_mod_user)) { if (PS(session_status) != php_session_active && (!PS(mod) || PS(mod) != &ps_mod_user)) {
ini_name = zend_string_init("session.save_handler", sizeof("session.save_handler") - 1, 0); set_user_save_handler_ini();
ini_val = zend_string_init("user", sizeof("user") - 1, 0);
PS(set_handler) = 1;
zend_alter_ini_entry(ini_name, ini_val, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
PS(set_handler) = 0;
zend_string_release_ex(ini_val, 0);
zend_string_release_ex(ini_name, 0);
} }
RETURN_TRUE; RETURN_TRUE;
@ -2090,14 +2095,8 @@ PHP_FUNCTION(session_set_save_handler)
/* remove shutdown function */ /* remove shutdown function */
remove_user_shutdown_function("session_shutdown", sizeof("session_shutdown") - 1); remove_user_shutdown_function("session_shutdown", sizeof("session_shutdown") - 1);
if (PS(mod) && PS(mod) != &ps_mod_user) { if (!PS(mod) || PS(mod) != &ps_mod_user) {
ini_name = zend_string_init("session.save_handler", sizeof("session.save_handler") - 1, 0); set_user_save_handler_ini();
ini_val = zend_string_init("user", sizeof("user") - 1, 0);
PS(set_handler) = 1;
zend_alter_ini_entry(ini_name, ini_val, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
PS(set_handler) = 0;
zend_string_release_ex(ini_val, 0);
zend_string_release_ex(ini_name, 0);
} }
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {

35
ext/session/tests/bug80889a.phpt Normal file
View file

@ -0,0 +1,35 @@
--TEST--
Bug #80889 (Cannot set save handler when save_handler is invalid)
--SKIPIF--
<?php include('skipif.inc'); ?>
--INI--
session.save_handler=whatever
--FILE--
<?php
$initHandler = ini_get('session.save_handler');
session_set_save_handler(
function ($savePath, $sessionName) {
return true;
},
function () {
return true;
},
function ($id) {
return '';
},
function ($id, $data) {
return true;
},
function ($id) {
return true;
},
function ($maxlifetime) {
return true;
}
);
$setHandler = ini_get('session.save_handler');
var_dump($initHandler, $setHandler);
?>
--EXPECT--
string(8) "whatever"
string(4) "user"