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

fix crash, enable session_id and fix test

Browse source
This commit is contained in:
Stanislav Malyshev 2013-08-04 17:43:20 -07:00
parent 82b0e8be99
commit b80d73ce15
3 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/session/mod_files.c
View file

@ -465,7 +465,7 @@ PS_CREATE_SID_FUNC(files)
do { do {
sid = php_session_create_id((void **)&data, newlen TSRMLS_CC); sid = php_session_create_id((void **)&data, newlen TSRMLS_CC);
/* Check collision */ /* Check collision */
if (ps_files_key_exists(data, sid TSRMLS_CC) == SUCCESS) { if (data && ps_files_key_exists(data, sid TSRMLS_CC) == SUCCESS) {
if (sid) { if (sid) {
efree(sid); efree(sid);
sid = NULL; sid = NULL;

3
ext/session/session.c
View file

@ -1829,9 +1829,6 @@ static PHP_FUNCTION(session_id)
} }
if (name) { if (name) {
if (PS(use_strict_mode) && argc) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Set session ID while session.use_strict_mode is enabled");
}
if (PS(id)) { if (PS(id)) {
efree(PS(id)); efree(PS(id));
} }

3
ext/session/tests/session_save_path_variation5.phpt
View file

@ -9,7 +9,6 @@ if(substr(PHP_OS, 0, 3) == "WIN")
session.save_handler=files session.save_handler=files
session.save_path= session.save_path=
session.name=PHPSESSID session.name=PHPSESSID
open_basedir=.
--FILE-- --FILE--
<?php <?php
@ -25,7 +24,7 @@ $directory = dirname(__FILE__);
$sessions = ($directory."/sessions"); $sessions = ($directory."/sessions");
chdir($directory); chdir($directory);
ini_set('open_basedir', '.');
// Delete the existing directory // Delete the existing directory
if (file_exists($sessions) === TRUE) { if (file_exists($sessions) === TRUE) {
@rmdir($sessions); @rmdir($sessions);