Skip to content

Commit a8f8cc2

Browse files
committed
Check sessions are active before output emitted consistently
1 parent ad3ee47 commit a8f8cc2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ext/session/session.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,8 @@ static PHP_INI_MH(OnUpdateSessionString) /* {{{ */
703703

704704
static PHP_INI_MH(OnUpdateSessionBool) /* {{{ */
705705
{
706-
SESSION_CHECK_OUTPUT_STATE;
707706
SESSION_CHECK_ACTIVE_STATE;
707+
SESSION_CHECK_OUTPUT_STATE;
708708
return OnUpdateBool(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
709709
}
710710
/* }}} */
@@ -715,8 +715,8 @@ static PHP_INI_MH(OnUpdateSidLength) /* {{{ */
715715
zend_long val;
716716
char *endptr = NULL;
717717

718-
SESSION_CHECK_OUTPUT_STATE;
719718
SESSION_CHECK_ACTIVE_STATE;
719+
SESSION_CHECK_OUTPUT_STATE;
720720
val = ZEND_STRTOL(ZSTR_VAL(new_value), &endptr, 10);
721721
if (endptr && (*endptr == '\0')
722722
&& val >= 22 && val <= PS_MAX_SID_LENGTH) {
@@ -735,8 +735,8 @@ static PHP_INI_MH(OnUpdateSidBits) /* {{{ */
735735
zend_long val;
736736
char *endptr = NULL;
737737

738-
SESSION_CHECK_OUTPUT_STATE;
739738
SESSION_CHECK_ACTIVE_STATE;
739+
SESSION_CHECK_OUTPUT_STATE;
740740
val = ZEND_STRTOL(ZSTR_VAL(new_value), &endptr, 10);
741741
if (endptr && (*endptr == '\0')
742742
&& val >= 4 && val <=6) {

0 commit comments

Comments
 (0)