com php-src: Remove unnecessary warning by warning reorder.: ext/session/session.c

Commit: dbba4418d82850d9362b701d6f8f6a676e1da45c Author: Yasuo Ohgaki <yohgaki@php.net> Sun, 17 Jan 2016 16:21:01 +0900 Parents: 9f2240963f75aa1d15c3ae2485e61635ec2c24fa Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dbba4418d82850d9362b701d6f8f6a676e1da45c Log: Remove unnecessary warning by warning reorder. Changed paths: M ext/session/session.c Diff: diff --git a/ext/session/session.c b/ext/session/session.c index 1de1d1e..0ff8600 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; }