Skip to content

[server] Fix network cache settings read from environment - #66425

Merged
rouault merged 1 commit into
qgis:masterfrom
elpaso:bugfix-gh59613-server-cache-settings-from-env
Jun 12, 2026
Merged

[server] Fix network cache settings read from environment#66425
rouault merged 1 commit into
qgis:masterfrom
elpaso:bugfix-gh59613-server-cache-settings-from-env

Conversation

@elpaso

@elpaso elpaso commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Fix #59613

@elpaso elpaso added Bug Either a bug report, or a bug fix. Let's hope for the latter! Server Related to QGIS server labels Jun 10, 2026
@github-actions github-actions Bot added this to the 4.2.0 milestone Jun 10, 2026
@elpaso elpaso added the backport queued_ltr_backports Queued Backports label Jun 10, 2026
Comment thread src/server/qgsserver.cpp Outdated
Comment thread src/server/qgsserver.cpp Outdated
@elpaso
elpaso force-pushed the bugfix-gh59613-server-cache-settings-from-env branch from 2a891d2 to 587471d Compare June 11, 2026 06:01
@rouault
rouault merged commit 91efce7 into qgis:master Jun 12, 2026
28 checks passed
@qgis-bot

Copy link
Copy Markdown
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 587471da55c... [server] Fix network cache settings read from environment
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 set advice.mergeConflict false"

stdout
Auto-merging src/server/qgsserver.cpp
CONFLICT (content): Merge conflict in src/server/qgsserver.cpp
Auto-merging tests/src/python/test_qgsserver_settings.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-66425-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 587471da55c430651770ee74841567fcbdfb2e17
# Push it to GitHub
git push --set-upstream origin backport-66425-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-66425-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jun 12, 2026
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 Bug Either a bug report, or a bug fix. Let's hope for the latter! failed backport The automated backport attempt failed, needs a manual backport Server Related to QGIS server

4 participants