Skip to content

[app:files] Use current directory for hashing. - #14674

Merged
MorrisJobke merged 1 commit into
nextcloud:masterfrom
CamilionEU:master
Mar 20, 2019
Merged

[app:files] Use current directory for hashing.#14674
MorrisJobke merged 1 commit into
nextcloud:masterfrom
CamilionEU:master

Conversation

@evilham

Copy link
Copy Markdown
Contributor

This fixes collisions that were causing uploads to break in a very
terrible way.

Kudos to @kesselb for finding the problematic place and to
@hottwister for the proposed solution.

Fixes#10527.

It would be great if this were backported to 15.0.

This fixes collisions that were causing uploads to break in a very
terrible way.
Kudos to @kesselb for finding the problematic place and to
@hottwister for the proposed solution.
Fixesnextcloud#10527.
@kesselb

Copy link
Copy Markdown
Contributor

Please keep in mind that these changes are only a part of the fix from owncloud. I'm still unsure if we need the other changes for something.

https://github.com/owncloud/core/pull/29393/files

@kesselbkesselb added this to the Nextcloud 16 milestone Mar 14, 2019
@kesselbkesselb added 3. to review Waiting for reviews bug labels Mar 14, 2019
@kesselb

Copy link
Copy Markdown
Contributor

@evilham could you please sign off your commits (check https://github.com/nextcloud/server/pull/14674/checks?check_run_id=77759184 for help)?

@MorrisJobkeMorrisJobke mentioned this pull request Mar 20, 2019
9 tasks

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@MorrisJobke

Copy link
Copy Markdown
Member

@evilham could you please sign off your commits (check https://github.com/nextcloud/server/pull/14674/checks?check_run_id=77759184 for help)?

@evilham Any chance that you can add this?

@MorrisJobke

Copy link
Copy Markdown
Member

Should also be fine without, because it's very little code change itself.

@MorrisJobke

Copy link
Copy Markdown
Member

/backport to stable15

@MorrisJobke
MorrisJobke merged commit 69f1871 into nextcloud:masterMar 20, 2019
@welcome

welcomeBot commented Mar 20, 2019

Copy link
Copy Markdown

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22
Most developers hang out on IRC. So join #nextcloud-dev on Freenode for a chat!

@backportbot-nextcloud

Copy link
Copy Markdown

backport to stable15 in #14762

@evilham

Copy link
Copy Markdown
ContributorAuthor

Sorry for the delay and thank you for merging.

Just as a comment: although I understand the motivation, I strongly disagree with the legal-name requirement; and indeed those bits of code are already unmistakeably under a compatible license.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upload via web interface of file with same name in different subfolders

3 participants

@evilham@kesselb@MorrisJobke