mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-25 09:49:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source 
* PHP-5.4:
  Fix #63379 - Don't reset mod_user_is_open in destroy
This commit is contained in:
Arpad Ray 2012-12-13 23:59:34 +00:00
commit 61bf1f4ee6
3 changed files with 114 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/session/mod_user_class.c
View File

@ -121,7 +121,6 @@ PHP_METHOD(SessionHandler, destroy)
return;
}
PS(mod_user_is_open) = 0;
RETVAL_BOOL(SUCCESS == PS(default_mod)->s_destroy(&PS(mod_data), key TSRMLS_CC));
}
/* }}} */

57
ext/session/tests/bug63379.phpt Normal file
View File

@ -0,0 +1,57 @@
--TEST--
Bug #63379: Warning when using session_regenerate_id(TRUE) with a SessionHandler
--INI--
session.save_handler=files
session.name=PHPSESSID
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
<?php
ob_start();
$handler = new SessionHandler;
session_set_save_handler($handler);
session_start();
$_SESSION['foo'] = 'hello';
var_dump($_SESSION);
session_regenerate_id(true);
echo "*** Regenerated ***\n";
var_dump($_SESSION);
$_SESSION['bar'] = 'world';
var_dump($_SESSION);
session_write_close();
session_unset();
session_start();
var_dump($_SESSION);
--EXPECTF--
array(1) {
["foo"]=>
string(5) "hello"
}
*** Regenerated ***
array(1) {
["foo"]=>
string(5) "hello"
}
array(2) {
["foo"]=>
string(5) "hello"
["bar"]=>
string(5) "world"
}
array(2) {
["foo"]=>
string(5) "hello"
["bar"]=>
string(5) "world"
}

57
ext/session/tests/bug63379_nodestroy.phpt Normal file
View File

@ -0,0 +1,57 @@
--TEST--
Bug #63379: Warning when using session_regenerate_id(TRUE) with a SessionHandler
--INI--
session.save_handler=files
session.name=PHPSESSID
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
<?php
ob_start();
$handler = new SessionHandler;
session_set_save_handler($handler);
session_start();
$_SESSION['foo'] = 'hello';
var_dump($_SESSION);
session_regenerate_id(false);
echo "*** Regenerated ***\n";
var_dump($_SESSION);
$_SESSION['bar'] = 'world';
var_dump($_SESSION);
session_write_close();
session_unset();
session_start();
var_dump($_SESSION);
--EXPECTF--
array(1) {
["foo"]=>
string(5) "hello"
}
*** Regenerated ***
array(1) {
["foo"]=>
string(5) "hello"
}
array(2) {
["foo"]=>
string(5) "hello"
["bar"]=>
string(5) "world"
}
array(2) {
["foo"]=>
string(5) "hello"
["bar"]=>
string(5) "world"
}