summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2015-11-07 07:17:43 -0800
committerXinchen Hui <laruence@gmail.com>2015-11-07 07:17:43 -0800
commit148bb622faa71090a3f6d9721aeb28a4ac720496 (patch)
treeef0dd38902134286cd785ae3e63124d190c841be
parent2d8d97cee25b632b21d4740c0c7c077196603e9d (diff)
downloadphp-git-148bb622faa71090a3f6d9721aeb28a4ac720496.tar.gz
Revert "Fixed bug #70876 Segmentation fault when regenerating session id with strict mode"
This reverts commit 0bf3ebb4ba77f38261d9cb21a205a7d31b7f85cf.
-rw-r--r--ext/session/mod_files.c4
-rw-r--r--ext/session/tests/bug70876.phpt17
2 files changed, 0 insertions, 21 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 933df93ca8..8301b73f5e 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -702,10 +702,6 @@ PS_VALIDATE_SID_FUNC(files)
{
PS_FILES_DATA;
- if (!data) {
- return FAILURE;
- }
-
return ps_files_key_exists(data, ZSTR_VAL(key));
}
diff --git a/ext/session/tests/bug70876.phpt b/ext/session/tests/bug70876.phpt
deleted file mode 100644
index 33e0323b9f..0000000000
--- a/ext/session/tests/bug70876.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Bug #70876 Segmentation fault when regenerating session id with strict mode
---SKIPIF--
-<?php include('skipif.inc'); ?>
---INI--
-html_errors=0
-session.save_handler=files
---FILE--
-<?php
-ini_set('session.use_strict_mode', true);
-session_start();
-session_regenerate_id();
-
-echo "ok";
-?>
---EXPECT--
-ok \ No newline at end of file