WOPI: set the net-zone name properly for https #13971
Merged
+6
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
%SRV_PROTO% will be replaced by http or https as needed in the discovery file. Part of #13894 Signed-off-by: Hubert Figuière <[email protected]> Change-Id: I2e6a7e3a05850cc856bbcbc081414d8ad89e4cff
hfiguiere
force-pushed
the
private/hub/net-zone
branch
from
76aa327 to
3aa6444
Compare
vmiklos
approved these changes
Jan 7, 2026
Contributor
vmiklos
left a comment
vmiklos
left a comment
There was a problem hiding this comment.
Works for me and looks reasonable, thanks.
Nit: did you consider covering this change with a test? You can do that in UnitHosting::testDiscovery() with some new asserts, I guess.
| COOLWSD::ServiceRoot; | ||
| if (requestDetails.isProxy()) | ||
| srvUrl = requestDetails.getProxyPrefix(); | ||
| Poco::replaceInPlace(xml, std::string("%SRV_URI%"), srvUrl); |
Contributor
There was a problem hiding this comment.
Nit: Is this still needed? As far as I see, we don't have a %SRV_URI% placeholder in discovery.xml.
Contributor
Author
There was a problem hiding this comment.
The discovery.xml file is preprocessed here:
https://github.com/CollaboraOnline/online/blob/main/wsd/ClientRequestDispatcher.cpp#L2643
before being loaded into the static cache.
It add the urlsrc attributes to the entries (they are not in the file)
Contributor
There was a problem hiding this comment.
Aha! I wasn't aware of that, thanks.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
%SRV_PROTO% will be replaced by http or https as needed in the discovery file.
Part of #13894
Change-Id: I2e6a7e3a05850cc856bbcbc081414d8ad89e4cff
Summary
Some consideration: any WOPI Host that was looking for the net-zone by name despite it being incorrect might need to be fixed.
TODO
Checklist
make prettier-writeand formatted the code.make checkmake runand manually verified that everything looks okay