Skip to content

Handle 204 no content for SingleImageLayer#3882

Merged
sebr72 merged 1 commit intomapfish:masterfrom
sogelink:204-no-content
Jan 21, 2026
Merged

Handle 204 no content for SingleImageLayer#3882
sebr72 merged 1 commit intomapfish:masterfrom
sogelink:204-no-content

Conversation

@arnaudboudier-sogelink
Copy link
Copy Markdown
Contributor

When receiving a 204 HTTP status code in tiled requests, Mapfish handles it by inserting a transparent tile. This is not the case for SingleImageLayer (such as WMS), where it results in an error.
I have implemented the same behavior as for tiled requests in this PR.

@arnaudboudier-sogelink
Copy link
Copy Markdown
Contributor Author

@sbrunner I have run the UT using make tests on my system without problem.
The problem in the CI is linked to this PR ? #3885 ?

@sebr72
Copy link
Copy Markdown
Contributor

sebr72 commented Dec 12, 2025

@arnaudboudier-sogelink Indeed there was a pb with the tests. So Gradle 9 commit was "remerged" in master.

@arnaudboudier-sogelink arnaudboudier-sogelink force-pushed the 204-no-content branch 2 times, most recently from 954f0d9 to 6eafcce Compare December 15, 2025 08:30
@arnaudboudier-sogelink
Copy link
Copy Markdown
Contributor Author

I have rebased my branch @sebr72 can you check that everything is OK ?

@sebr72
Copy link
Copy Markdown
Contributor

sebr72 commented Dec 19, 2025

@arnaudboudier-sogelink I had a look at you PR, and I would approve it. But we had started the migration of Spring . So we have to freeze accepting new PRs, to keep our costs down.
Sorry for the delay. But it will be much easier to merge your PR on top of Spring rather than replay your changes in ours.

@arnaudboudier-sogelink
Copy link
Copy Markdown
Contributor Author

Ok no problem, do you know if it will be possible (once my commit will be merged after your spring migration), to backport it also to 3.33 version ?

@sebr72
Copy link
Copy Markdown
Contributor

sebr72 commented Dec 29, 2025

@arnaudboudier-sogelink I am not sure how we will proceed to get this PR back-ported to 3.33, but I am sure we will find a solution even if it requires extra work (since you created it before Spring 7 was in master)

@sbrunner sbrunner added the backport 3.33 Add this label to backport the pull request to the '3.33' branch label Jan 5, 2026
@sebr72
Copy link
Copy Markdown
Contributor

sebr72 commented Jan 15, 2026

@arnaudboudier-sogelink MFP is now using Spring 7 in master. Your PR is the next on our list. I'll be mornitoring when it is ready, then do the review.

@sebr72
Copy link
Copy Markdown
Contributor

sebr72 commented Jan 21, 2026

@arnaudboudier-sogelink Could you please resolve the conflicts before I do the review ? - We would like to do the MFP release 4.0 quite soon and we are hoping it will include your fix, if you could let us know by when you will have time to do it ?

@arnaudboudier-sogelink
Copy link
Copy Markdown
Contributor Author

@sebr72 I have corrected the MR conflict hope verything works fine

@arnaudboudier-sogelink arnaudboudier-sogelink force-pushed the 204-no-content branch 2 times, most recently from 83ce080 to c2473b5 Compare January 21, 2026 10:23
@arnaudboudier-sogelink
Copy link
Copy Markdown
Contributor Author

arnaudboudier-sogelink commented Jan 21, 2026

@sebr72 I add to change some code since you updated to spring 7, for the backport in 3.33, it will not possible to just cherry pick this commit (since it is compatible only for spring 7). But I have locally the commit before spring update, so I think i will need to make another PR. Right ?

@sebr72
Copy link
Copy Markdown
Contributor

sebr72 commented Jan 21, 2026

@arnaudboudier-sogelink Once this is is green, I will have a look at the code and see if a second PR is needed. I guess you might be right about creating a new PR (but not a definite answer yet)

@sebr72 sebr72 self-requested a review January 21, 2026 10:43
Copy link
Copy Markdown
Contributor

@sebr72 sebr72 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work, Thanks.

@sebr72 sebr72 merged commit 3602e46 into mapfish:master Jan 21, 2026
7 checks passed
@geo-ghci-int geo-ghci-int bot removed the backport 3.33 Add this label to backport the pull request to the '3.33' branch label Jan 21, 2026
@sebr72
Copy link
Copy Markdown
Contributor

sebr72 commented Jan 21, 2026

@arnaudboudier-sogelink It should work with a small change in the generated PR. Otherwise we will go with your suggestion of a new PR.

@arnaudboudier-sogelink
Copy link
Copy Markdown
Contributor Author

arnaudboudier-sogelink commented Jan 21, 2026

@sebr72 You mean I can just add a commit to this PR that made this PR spring 6 compatible ? And then you are able to backport it to 3.33 ?

@sebr72
Copy link
Copy Markdown
Contributor

sebr72 commented Jan 21, 2026

@arnaudboudier-sogelink I meant we do as usual, and I see if I can fix the merge from main to 3.33. If I can't I will ask you for help. But it is all fixed now.

@arnaudboudier-sogelink
Copy link
Copy Markdown
Contributor Author

@sebr72 Indeed, it seems that my modifications were also working in spring 6. Thank you. Do you know when you will be able to release a new 3.33.x version ?

@arnaudboudier-sogelink
Copy link
Copy Markdown
Contributor Author

@sebr72 Do you know when you will be able to make the 3.33.x release ? thank you

@sebr72
Copy link
Copy Markdown
Contributor

sebr72 commented Feb 4, 2026

@arnaudboudier-sogelink We are planning to do it today.
Release 3.33.10 is available.

@geo-ghci-int geo-ghci-int bot added this to the 4.0.0 milestone Feb 13, 2026
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.

3 participants