[HttpFoundation] Fix session-related BC break #24952
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@sroze yes but I prefer this approach, as it's more conservative: the diff with pre-7.2-concerns is much lighter, thus easier to validate. |
sroze
reviewed
Nov 13, 2017
| @@ -340,7 +335,7 @@ public function isStarted() | |||
| */ | |||
| public function setOptions(array $options) | |||
| { | |||
| if (headers_sent()) { | |||
| if (headers_sent() || (\PHP_VERSION_ID >= 50400 && \PHP_SESSION_ACTIVE === session_status())) { | |||
There was a problem hiding this comment.
Could you move that in a private method?
|
@nicolas-grekas I don't mind either tbh so... 👍 |
|
I borrowed your test case. |
Could you clarify this one? |
|
from |
|
Hehe, true 👍 |
|
Thank you @sroze. |
nicolas-grekas
added a commit
that referenced
this pull request
Nov 13, 2017
…kas, sroze) This PR was merged into the 2.7 branch. Discussion ---------- [HttpFoundation] Fix session-related BC break | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24941, #24934, #24947 and #24946 | License | MIT | Doc PR | - Conservative fix. Commits ------- 38186aa [HttpFoundation] Add test 3eaa188 [HttpFoundation] Fix session-related BC break
This was referenced Nov 13, 2017
Merged
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conservative fix.