[HttpFoundation] Fix setting session-related ini settings #27067
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
nicolas-grekas
approved these changes
Apr 26, 2018
| @@ -340,21 +340,23 @@ public function setOptions(array $options) | |||
| } | |||
|
|
|||
| $validOptions = array_flip(array( | |||
| 'cache_limiter', 'cookie_domain', 'cookie_httponly', | |||
| 'cache_limiter', 'cache_expire', 'cookie_domain', 'cookie_httponly', | |||
There was a problem hiding this comment.
can you move it after cookie_domain? would make it alpha order
| 'sid_length', 'sid_bits_per_character', 'trans_sid_hosts', 'trans_sid_tags', | ||
| )); | ||
|
|
||
| foreach ($options as $key => $value) { | ||
| if (isset($validOptions[$key])) { | ||
| ini_set('session.'.$key, $value); | ||
| // All options starts with 'session.' except 'url_rewriter.tags' | ||
| $name = 'url_rewriter.tags' != $key ? 'session.'.$key : $key; |
| ini_set('session.'.$key, $value); | ||
| // All options starts with 'session.' except 'url_rewriter.tags' | ||
| $name = 'url_rewriter.tags' != $key ? 'session.'.$key : $key; | ||
| ini_set($name, $value); |
There was a problem hiding this comment.
let's inline?
ini_set('url_rewriter.tags' !== $key ? 'session.'.$key : $key, $value);
| 'sid_length', 'sid_bits_per_character', 'trans_sid_hosts', 'trans_sid_tags', | ||
| )); | ||
|
|
||
| foreach ($options as $key => $value) { | ||
| if (isset($validOptions[$key])) { | ||
| ini_set('session.'.$key, $value); | ||
| // All options starts with 'session.' except 'url_rewriter.tags' |
There was a problem hiding this comment.
I think we should remove this comment as it just duplicates what the code tells quite evidently
| $this->getStorage($options); | ||
|
|
||
| $this->assertEquals('a=href', ini_get('url_rewriter.tags')); | ||
| $this->assertEquals(200, ini_get('session.cache_expire')); |
There was a problem hiding this comment.
please use assertSame in both cases
|
|
||
| $this->getStorage($options); | ||
|
|
||
| $this->assertEquals('a=href', ini_get('url_rewriter.tags')); |
There was a problem hiding this comment.
This fails on HHVM. I suggest to skip this test on HHVM.:
if (defined('HHVM_VERSION')) {
$this->markTestSkipped('HHVM is not handled in this test case.');
}|
@nicolas-grekas , thanks for your review! updated |
nicolas-grekas
approved these changes
Apr 27, 2018
Tobion
approved these changes
Apr 28, 2018
|
Good catch, thanks @e-moe. |
Tobion
added a commit
that referenced
this pull request
Apr 28, 2018
…(e-moe) This PR was merged into the 2.7 branch. Discussion ---------- [HttpFoundation] Fix setting session-related ini settings | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #27011 | License | MIT | Doc PR | n/a Added missed option `cache_expire` Fixed typo in `upload_progress.min_freq` Fixed ini_set name prefix of `url_rewriter.tags` Commits ------- 64a0f23 Fix #27011: Session ini_set bug
This was referenced Apr 30, 2018
Merged
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.
Added missed option
cache_expireFixed typo in
upload_progress.min_freqFixed ini_set name prefix of
url_rewriter.tags