mirror of
https://github.com/php/php-src.git
synced 2024-09-24 11:27:28 +00:00
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
This commit is contained in:
commit
70ae67b5da
@ -2414,7 +2414,7 @@ static void php_session_rfc1867_update(php_session_rfc1867_progress *progress, i
|
|||||||
php_session_initialize(TSRMLS_C);
|
php_session_initialize(TSRMLS_C);
|
||||||
PS(session_status) = php_session_active;
|
PS(session_status) = php_session_active;
|
||||||
IF_SESSION_VARS() {
|
IF_SESSION_VARS() {
|
||||||
progress->cancel_upload = php_check_cancel_upload(progress TSRMLS_CC);
|
progress->cancel_upload |= php_check_cancel_upload(progress TSRMLS_CC);
|
||||||
ZEND_SET_SYMBOL_WITH_LENGTH(Z_ARRVAL_P(PS(http_session_vars)), progress->key.c, progress->key.len+1, progress->data, 2, 0);
|
ZEND_SET_SYMBOL_WITH_LENGTH(Z_ARRVAL_P(PS(http_session_vars)), progress->key.c, progress->key.len+1, progress->data, 2, 0);
|
||||||
}
|
}
|
||||||
php_session_flush(TSRMLS_C);
|
php_session_flush(TSRMLS_C);
|
||||||
|
Loading…
Reference in New Issue
Block a user