Skip to content

Commit 2a4f19a

Browse files
committed
XWIKI-21211: Upgrade the standalone packaging to Jetty 12.x
* Enable usage of // in URL paths * See XWIKI-22428
1 parent c2cd349 commit 2a4f19a

File tree

2 files changed

+6
-4
lines changed
  • xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources

2 files changed

+6
-4
lines changed

xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources/jetty/etc/jetty.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<!-- TODO: Put back <Property name="jetty.httpConfig.uriCompliance" default="DEFAULT"/> instead of
8888
RFC3986,AMBIGUOUS_PATH_ENCODING when we understand how to pass that value from xwiki.ini again.
8989
See https://github.com/jetty/jetty.project/issues/12162 -->
90-
<Set name="uriCompliance"><Call class="org.eclipse.jetty.http.UriCompliance" name="from"><Arg>RFC3986,AMBIGUOUS_PATH_ENCODING</Arg></Call></Set>
90+
<Set name="uriCompliance"><Call class="org.eclipse.jetty.http.UriCompliance" name="from"><Arg>RFC3986,AMBIGUOUS_PATH_ENCODING,AMBIGUOUS_EMPTY_SEGMENT</Arg></Call></Set>
9191
<Set name="requestCookieCompliance"><Call class="org.eclipse.jetty.http.CookieCompliance" name="from"><Arg><Property name="jetty.httpConfig.requestCookieCompliance" default="RFC6265"/></Arg></Call></Set>
9292
<Set name="responseCookieCompliance"><Call class="org.eclipse.jetty.http.CookieCompliance" name="from"><Arg><Property name="jetty.httpConfig.responseCookieCompliance" default="RFC6265"/></Arg></Call></Set>
9393
<Set name="relativeRedirectAllowed"><Property name="jetty.httpConfig.relativeRedirectAllowed" default="false"/></Set>

xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/src/main/resources/start.d/xwiki.ini

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jetty.deploy.extractWars=false
2828
## Jetty has added a protection in URLs so that encoded characters such as % are prohibited by default. Since
2929
## XWiki uses them, we need to configure Jetty to allow for it. See
3030
## https://www.eclipse.org/jetty/documentation/jetty-10/operations-guide/index.html#og-module-server-compliance
31-
## Since Jetty 12, using a URI compliance of just RFC3986 is no longer enough, we also need to add
32-
## AMBIGUOUS_PATH_ENCODING. Remove this when https://jira.xwiki.org/browse/XWIKI-22422 is fixed.
33-
jetty.httpConfig.uriCompliance=RFC3986,AMBIGUOUS_PATH_ENCODING
31+
## Since Jetty 12, using a URI compliance of just RFC3986 is no longer enough, we also need to relax some extra
32+
## rules.
33+
## Remove AMBIGUOUS_PATH_ENCODING when https://jira.xwiki.org/browse/XWIKI-22422 is fixed.
34+
## Remove AMBIGUOUS_EMPTY_SEGMENT when https://jira.xwiki.org/browse/XWIKI-22428 is fixed.
35+
jetty.httpConfig.uriCompliance=RFC3986,AMBIGUOUS_PATH_ENCODING,AMBIGUOUS_EMPTY_SEGMENT

0 commit comments

Comments
 (0)