Prefix $path for filename for internal file cache #14211
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
Signed-off-by: Daniel Kesselberg <[email protected]>
Signed-off-by: Daniel Kesselberg <[email protected]>
icewind1991
reviewed
Feb 15, 2019
|
|
||
| try { | ||
| if ($this->headObject($path)) { | ||
| if (isset($this->filesCache[$path]) && $this->headObject($path)) { |
Member
There was a problem hiding this comment.
what is the reasoning here?
Contributor
Author
There was a problem hiding this comment.
If filesCache has been populated by opendir we already know that path is a file or not without calling headObject. If you wonder about "only call headObject if $path isset in filescache" 0d667d1
icewind1991
approved these changes
Feb 17, 2019
Member
|
@kesselb @icewind1991 Backport to stable15? |
Contributor
Author
|
/backport to stable15 |
|
backport to stable15 in #14288 |
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.
Follow-Up #11518
file1.txtfolder/file1.txtIf a file with the same name exists in a sub directory (prefix to be precise)
file1.txtis overwritten (the array key not the file itself) byfolder/file1.txt.getContentLengthandgetLastModifiedare called withfolder/file1.txtand the internal cache does not hit.