diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-04 17:43:20 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-04 17:43:20 -0700 |
| commit | b80d73ce154e7f740f9ada446f45dbcdac38a64b (patch) | |
| tree | 104a5c50b6d5b6b5e3f573654c5f1123a63c4b71 | |
| parent | 82b0e8be99065b61b622df21bbc7494d2fbca3cd (diff) | |
| download | php-git-b80d73ce154e7f740f9ada446f45dbcdac38a64b.tar.gz | |
fix crash, enable session_id and fix test
| -rw-r--r-- | ext/session/mod_files.c | 2 | ||||
| -rw-r--r-- | ext/session/session.c | 3 | ||||
| -rw-r--r-- | ext/session/tests/session_save_path_variation5.phpt | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 6beee097b2..e5733b44f4 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -465,7 +465,7 @@ PS_CREATE_SID_FUNC(files) do { sid = php_session_create_id((void **)&data, newlen TSRMLS_CC); /* 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) { efree(sid); sid = NULL; diff --git a/ext/session/session.c b/ext/session/session.c index d90b5c6b84..c02a10d7bf 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1829,9 +1829,6 @@ static PHP_FUNCTION(session_id) } 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)) { efree(PS(id)); } diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt index 5407b5e15a..c015dcc95c 100644 --- a/ext/session/tests/session_save_path_variation5.phpt +++ b/ext/session/tests/session_save_path_variation5.phpt @@ -9,7 +9,6 @@ if(substr(PHP_OS, 0, 3) == "WIN") session.save_handler=files session.save_path= session.name=PHPSESSID -open_basedir=. --FILE-- <?php @@ -25,7 +24,7 @@ $directory = dirname(__FILE__); $sessions = ($directory."/sessions"); chdir($directory); - +ini_set('open_basedir', '.'); // Delete the existing directory if (file_exists($sessions) === TRUE) { @rmdir($sessions); |