diff options
| author | Xinchen Hui <laruence@php.net> | 2014-01-16 14:38:35 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-01-16 14:38:35 +0800 |
| commit | 271053ad470e4b7f0e1eb46dfc1a4369d5c7baa2 (patch) | |
| tree | b6a78d08c2682e1f8d96e5d0f3826c17f083c590 | |
| parent | 57cf8eaccd7098d57f4dfd8004c334559029746b (diff) | |
| download | php-git-271053ad470e4b7f0e1eb46dfc1a4369d5c7baa2.tar.gz | |
Revert "Bug #66481 Segfaults on session_name()"
This reverts commit 5662ffb295c6f9cb10768d8246f2656aae6b8abb.
| -rw-r--r-- | ext/session/session.c | 7 | ||||
| -rw-r--r-- | ext/session/tests/bug66481.phpt | 16 |
2 files changed, 0 insertions, 23 deletions
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-- -<?php include('skipif.inc'); ?> ---FILE-- -<?php - -var_dump(session_name("foo")); -var_dump(session_name("bar")); - ---EXPECTF-- -string(9) "PHPSESSID" -string(3) "foo" - |