diff options
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 8619c3fe62..e16b79f585 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -689,19 +689,11 @@ 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))) { + if ((!new_value_length || is_numeric_string(new_value, new_value_length, NULL, NULL, 0))) { int err_type; - if (stage == ZEND_INI_STAGE_RUNTIME) { + if (stage == ZEND_INI_STAGE_RUNTIME || stage == ZEND_INI_STAGE_ACTIVATE || stage == ZEND_INI_STAGE_STARTUP) { err_type = E_WARNING; } else { err_type = E_ERROR; |