From 271053ad470e4b7f0e1eb46dfc1a4369d5c7baa2 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 16 Jan 2014 14:38:35 +0800 Subject: Revert "Bug #66481 Segfaults on session_name()" This reverts commit 5662ffb295c6f9cb10768d8246f2656aae6b8abb. --- ext/session/session.c | 7 ------- ext/session/tests/bug66481.phpt | 16 ---------------- 2 files changed, 23 deletions(-) delete mode 100644 ext/session/tests/bug66481.phpt diff --git a/ext/session/session.c b/ext/session/session.c index 5ea38475db..35db50ae64 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -617,13 +617,6 @@ static PHP_INI_MH(OnUpdateSaveDir) /* {{{ */ static PHP_INI_MH(OnUpdateName) /* {{{ */ { - /* Don't accept a blank session name from php.ini or -d session.name= */ - if (!PG(modules_activated) && !new_value_length) { - /* Force the default value. */ - new_value = "PHPSESSID"; - new_value_length = 9; - } - /* Numeric session.name won't work at all */ if (PG(modules_activated) && (!new_value_length || is_numeric_string(new_value, new_value_length, NULL, NULL, 0))) { diff --git a/ext/session/tests/bug66481.phpt b/ext/session/tests/bug66481.phpt deleted file mode 100644 index 0479b5ff4d..0000000000 --- a/ext/session/tests/bug66481.phpt +++ /dev/null @@ -1,16 +0,0 @@ ---TEST-- -Bug #66481: Calls to session_name() segfault when session.name is null. ---INI-- -session.name= ---SKIPIF-- - ---FILE-- -