com php-src: Revert "Fixed bug #70876 Segmentation fault when regenerating session id with strict mode": ext/session/mod_files.c ext
/session/tests/bug70876.phpt
| From: | Xinchen Hui | Date: | Sat, 07 Nov 2015 15:17:43 +0000 |
| Subject: | com php-src: Revert "Fixed bug #70876 Segmentation fault when regenerating session id with strict mode": ext/session/mod_files.c ext /session/tests/bug70876.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89636@lists.php.net to get a copy of this message | ||
Commit: 148bb622faa71090a3f6d9721aeb28a4ac720496
Author: Xinchen Hui <laruence@gmail.com> Sat, 7 Nov 2015 07:17:43 -0800
Parents: 2d8d97cee25b632b21d4740c0c7c077196603e9d
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=148bb622faa71090a3f6d9721aeb28a4ac720496
Log:
Revert "Fixed bug #70876 Segmentation fault when regenerating session id with strict mode"
This reverts commit 0bf3ebb4ba77f38261d9cb21a205a7d31b7f85cf.
Bugs:
https://bugs.php.net/70876
Changed paths:
M ext/session/mod_files.c
D ext/session/tests/bug70876.phpt
Diff:
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 933df93..8301b73 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 33e0323..0000000
--- 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