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 case-sensitivity of http header checks #59619

Merged
merged 1 commit into from
Dec 2, 2024

Conversation

nyalldawson
Copy link
Collaborator

Since qt 6.8 header keys are forced to lowercase, so we need to adapt all checks accordingly

Copy link

github-actions bot commented Nov 27, 2024

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 4caee87)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 4caee87)

Since qt 6.8 header keys are forced to lowercase, so we need to
adapt all checks accordingly
@nyalldawson
Copy link
Collaborator Author

Unrelated test failure

@nyalldawson nyalldawson merged commit 682aae0 into qgis:master Dec 2, 2024
30 of 31 checks passed
@nyalldawson nyalldawson deleted the fix_testsqt6 branch December 2, 2024 23:10
@qgis-bot
Copy link
Collaborator

qgis-bot commented Dec 2, 2024

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 4caee87962c... Fix case-sensitivity of http header checks
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging src/providers/wfs/qgsbasenetworkrequest.cpp
Auto-merging tests/src/core/testqgsnetworkaccessmanager.cpp
Auto-merging tests/src/python/test_qgsblockingnetworkrequest.py
CONFLICT (content): Merge conflict in tests/src/python/test_qgsblockingnetworkrequest.py

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-59619-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 4caee87962cbf99dd95e649ab863bab5bdfb4cac
# Push it to GitHub
git push --set-upstream origin backport-59619-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-59619-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Dec 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports backport release-3_40 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants