From dbba4418d82850d9362b701d6f8f6a676e1da45c Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Sun, 17 Jan 2016 16:21:01 +0900 Subject: [PATCH] Remove unnecessary warning by warning reorder. --- ext/session/session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/session/session.c b/ext/session/session.c index 1de1d1edb0..0ff8600de4 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -2055,13 +2055,13 @@ static PHP_FUNCTION(session_regenerate_id) return; } - if (SG(headers_sent) && PS(use_cookies)) { - php_error_docref(NULL, E_WARNING, "Cannot regenerate session id - headers already sent"); + if (PS(session_status) != php_session_active) { + php_error_docref(NULL, E_WARNING, "Cannot regenerate session id - session is not active"); RETURN_FALSE; } - if (PS(session_status) != php_session_active) { - php_error_docref(NULL, E_WARNING, "Cannot regenerate session id - session is not active"); + if (SG(headers_sent) && PS(use_cookies)) { + php_error_docref(NULL, E_WARNING, "Cannot regenerate session id - headers already sent"); RETURN_FALSE; } -- 2.40.0