com php-src: Revert "Bug #66481 Segfaults on session_name( )": ext/session/session.c ext/session/tests/bug6 6481.phpt

Commit: 271053ad470e4b7f0e1eb46dfc1a4369d5c7baa2 Author: Xinchen Hui <laruence@php.net> Thu, 16 Jan 2014 14:38:35 +0800 Parents: 57cf8eaccd7098d57f4dfd8004c334559029746b Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=271053ad470e4b7f0e1eb46dfc1a4369d5c7baa2 Log: Revert "Bug #66481 Segfaults on session_name()" This reverts commit 5662ffb295c6f9cb10768d8246f2656aae6b8abb. Bugs: https://bugs.php.net/66481 Changed paths: M ext/session/session.c D ext/session/tests/bug66481.phpt Diff: diff --git a/ext/session/session.c b/ext/session/session.c index 5ea3847..35db50a 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 0479b5f..0000000 --- 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" -