FIX Reset time limit back to original value #11621
Merged
Conversation
This file contains 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
GuySartorelli
requested changes
Feb 20, 2025
emteknetnz
force-pushed
the
pulls/5.3/time-limit
branch
from
0548c9d to
e6709e3
Compare
|
Have moved fix to SapphireTest |
|
|
||
| // Reset max_execution_time in case some code or a unit test changed it, | ||
| // either via ini_set() or set_time_limit() | ||
| ini_set('max_execution_time', $this->origMaxExecutionTime); |
There was a problem hiding this comment.
Don't we still need to reset set_time_limit()? This changes the max execution time setting, but does that also result in changing the actual time limit?
There was a problem hiding this comment.
set_time_limit() is an shorthand alias for ini_set('max_execution_time'). It seems slightly less confusing just not use the alias.
I've tested locally that it still fixes the issue that was seen in CI
There was a problem hiding this comment.
I can't find anything in the docs of set_time_limit() that supports it being an alias, but I'll accept "I've tested locally" as good enough.
GuySartorelli
approved these changes
Feb 20, 2025
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.
Issue silverstripe/.github#368