From: Stanislav Malyshev <stas@php.net>
Date: Mon, 5 Aug 2013 00:43:20 +0000 (-0700)
Subject: fix crash, enable session_id and fix test
X-Git-Tag: php-5.5.2~34^2~6^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b80d73ce154e7f740f9ada446f45dbcdac38a64b;p=php

fix crash, enable session_id and fix test
---

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);