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

Accept valid lsColJob reply XML content types #4919

Merged
merged 1 commit into from
Sep 12, 2022

Conversation

claucambra
Copy link
Collaborator

It seems we refuse some XML content type formats even though they are still valid and can be parsed by the parser

Fixes #4873

Signed-off-by: Claudio Cambra claudio.cambra@gmail.com

@claucambra
Copy link
Collaborator Author

/backport to stable-3.6

src/libsync/discoveryphase.cpp Outdated Show resolved Hide resolved
src/libsync/networkjobs.cpp Outdated Show resolved Hide resolved
src/libsync/discoveryphase.cpp Show resolved Hide resolved
@claucambra claucambra force-pushed the bugfix/accept-valid-content-types branch from 7da962e to eda4912 Compare September 12, 2022 09:49
@claucambra claucambra requested a review from mgallien September 12, 2022 09:49
@codecov
Copy link

codecov bot commented Sep 12, 2022

Codecov Report

Merging #4919 (2b3efbf) into master (a48aee9) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #4919      +/-   ##
==========================================
+ Coverage   57.18%   57.20%   +0.01%     
==========================================
  Files         138      138              
  Lines       17136    17138       +2     
==========================================
+ Hits         9800     9804       +4     
+ Misses       7336     7334       -2     
Impacted Files Coverage Δ
src/libsync/discoveryphase.cpp 72.54% <100.00%> (+0.07%) ⬆️
src/libsync/networkjobs.cpp 50.00% <100.00%> (+0.07%) ⬆️
src/libsync/vfs/cfapi/cfapiwrapper.cpp 74.65% <0.00%> (+0.45%) ⬆️

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
@claucambra claucambra force-pushed the bugfix/accept-valid-content-types branch from eda4912 to 2b3efbf Compare September 12, 2022 11:57
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-4919-2b3efbfb2a88735d3fd943ab4dff5ed8219c8547-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarcloud
Copy link

sonarcloud bot commented Sep 12, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@mgallien mgallien merged commit 88464a0 into master Sep 12, 2022
@mgallien mgallien deleted the bugfix/accept-valid-content-types branch September 12, 2022 13:20
@mgallien mgallien added this to the 3.7.0 milestone Oct 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: client does not work when the server is forcing text/xml content type
3 participants