Skip to content

Commit ce8c023

Browse files
committed
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
When uploading multiple files, the array in the session where the progress data is stored (and cancel_upload key is set) was overwritten whenever the progress data was updated, so pending uploads would proceed anyway.
1 parent fa8611c commit ce8c023

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ext/session/session.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2366,7 +2366,7 @@ static void php_session_rfc1867_update(php_session_rfc1867_progress *progress, i
23662366
php_session_initialize(TSRMLS_C);
23672367
PS(session_status) = php_session_active;
23682368
IF_SESSION_VARS() {
2369-
progress->cancel_upload = php_check_cancel_upload(progress TSRMLS_CC);
2369+
progress->cancel_upload |= php_check_cancel_upload(progress TSRMLS_CC);
23702370
ZEND_SET_SYMBOL_WITH_LENGTH(Z_ARRVAL_P(PS(http_session_vars)), progress->key.c, progress->key.len+1, progress->data, 2, 0);
23712371
}
23722372
php_session_flush(TSRMLS_C);

0 commit comments

Comments
 (0)