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(dav): adjust usages of webdav.customRequest #44344

Merged
merged 1 commit into from
Mar 20, 2024

Conversation

st3iny
Copy link
Member

@st3iny st3iny commented Mar 20, 2024

Summary

Webdav is not using axios any more so we have to await a response's body ourselves.

Checklist

@st3iny
Copy link
Member Author

st3iny commented Mar 20, 2024

/backport to stable28

@ChristophWurst
Copy link
Member

Is it broken in 28? 🤔

@st3iny
Copy link
Member Author

st3iny commented Mar 20, 2024

It's not so we can skip the backport for now.

Although it was fixed for >= 27 in other places last year: a66cae0

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
@skjnldsv skjnldsv merged commit c451829 into master Mar 20, 2024
104 checks passed
@skjnldsv skjnldsv deleted the fix/dav/webdav-5-fetch branch March 20, 2024 10:46
@Altahrim Altahrim mentioned this pull request Mar 20, 2024
@valentin-ed
Copy link

There is still the issue on 28.0.9, as I can see in https://github.com/nextcloud/server/blob/v28.0.9/apps/dav/src/service/CalendarService.js the line 61 wasn't change with this PR. When do you think this would be done ?

@st3iny
Copy link
Member Author

st3iny commented Sep 4, 2024

/backport to stable28

Copy link

backportbot bot commented Sep 4, 2024

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

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

# Create the new backport branch
git checkout -b backport/44344/stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick e727a3b0

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/44344/stable28

Error: Failed to clone repository: Failed to checkout branches: Updating 1cc7851..ab511e8
From https://github.com/nextcloud/server

  • [deleted] (none) -> origin/adapterQueryOpti
  • [deleted] (none) -> origin/automated/noid/stable29-fix-npm-audit
  • [deleted] (none) -> origin/backport/47325/stable26
  • [deleted] (none) -> origin/backport/47598/stable29
  • [deleted] (none) -> origin/backport/stable30/47158
  • [deleted] (none) -> origin/chore/theming
  • [deleted] (none) -> origin/exceptionsTranslateShare
  • [deleted] (none) -> origin/executeStatementOnDelete
  • [deleted] (none) -> origin/fix/appstore-upgrade-failure
  • [deleted] (none) -> origin/fix/bring-back-security-fixes
    error: Your local changes to the following files would be overwritten by merge:
    dist/4254-4254.js.map.license
    dist/4696-4696.js.map.license
    dist/5643-5643.js.map.license
    Please commit your changes or stash them before you merge.
    Aborting

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

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

Successfully merging this pull request may close these issues.

[Bug]: Webdav availability request gives malformed response
4 participants