Merge branch 'PHP-5.5'

arraypad · arraypad · commit da31bef9cbf0 · 2013-06-27T19:25:11.000+01:00
* PHP-5.5:
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
  Update NEWS
  BC fix for PR 109 merge - create_sid() method in SessionHandler
  Tests, fixes and optimisations
  Add create_sid to session_set_save_handler and SessionHandler
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -2414,7 +2414,7 @@ static void php_session_rfc1867_update(php_session_rfc1867_progress *progress, i
 	php_session_initialize(TSRMLS_C);
 	PS(session_status) = php_session_active;
 	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);
 	}
 	php_session_flush(TSRMLS_C);

Original file line number	Diff line number	Diff line change
`@@ -2414,7 +2414,7 @@ static void php_session_rfc1867_update(php_session_rfc1867_progress *progress, i`
`2414`	`2414`	`php_session_initialize(TSRMLS_C);`
`2415`	`2415`	`PS(session_status) = php_session_active;`
`2416`	`2416`	`IF_SESSION_VARS() {`
`2417`		`- progress->cancel_upload = php_check_cancel_upload(progress TSRMLS_CC);`
	`2417`	`+ progress->cancel_upload \|= php_check_cancel_upload(progress TSRMLS_CC);`
`2418`	`2418`	`ZEND_SET_SYMBOL_WITH_LENGTH(Z_ARRVAL_P(PS(http_session_vars)), progress->key.c, progress->key.len+1, progress->data, 2, 0);`
`2419`	`2419`	`}`
`2420`	`2420`	`php_session_flush(TSRMLS_C);`