Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ftp external storage with filezilla server #36905

Merged
merged 1 commit into from
Apr 3, 2023
Merged

Conversation

icewind1991
Copy link
Member

@icewind1991 icewind1991 commented Feb 28, 2023

Fix #31510, Close #33203

  • filezilla doesn't like "" as parameter for mdtm (all others seem fine)
  • filezilla sends fractional modified date

Haven't had any success with dockerized filezilla server setups so no CI for now :(

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Feb 28, 2023
@icewind1991 icewind1991 added this to the Nextcloud 26 milestone Feb 28, 2023
@icewind1991 icewind1991 marked this pull request as ready for review February 28, 2023 16:19
@icewind1991 icewind1991 requested review from a team, ArtificialOwl, blizzz and come-nc and removed request for a team February 28, 2023 16:19
@kesselb
Copy link
Contributor

kesselb commented Feb 28, 2023

FYI: #33203

Please verify that the fractional dates handling is not needed in filemtime / $currentDir as well.

Haven't had any success with dockerized filezilla server setups so no CI for now :(

I can confirm that.

@icewind1991
Copy link
Member Author

Please verify that the fractional dates handling is not needed in filemtime / $currentDir as well.

Shouldn't be needed for filezilla as that supports mdtm, I've added it anyway in case there is a server that doesn't but does send fractional dates.

@blizzz blizzz mentioned this pull request Mar 7, 2023
@blizzz blizzz modified the milestones: Nextcloud 26, Nextcloud 27 Mar 7, 2023
- filezilla doesn't like "" as parameter for `mdtm` (all others seem fine)
- filezilla sends fractional modified date

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 merged commit d6ff5d8 into master Apr 3, 2023
@icewind1991 icewind1991 deleted the ftp-fix-filezilla branch April 3, 2023 18:50
@icewind1991
Copy link
Member Author

/backport to stable26

@icewind1991
Copy link
Member Author

/backport to stable25

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: after upgrade NC to 23.0.2 app external storage support stops working
5 participants