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 #6883 relative welcome redirect (#6886) #6894

Merged
merged 3 commits into from
Sep 23, 2021

Conversation

gregw
Copy link
Contributor

@gregw gregw commented Sep 22, 2021

Cheery pick 9 to 10

Fix #6883 relative welcome redirect

  • make all redirects able to be relative
  • added test for relative redirection in ResourceService

Signed-off-by: Greg Wilkins gregw@webtide.com

Fix #6883 relative welcome redirect
 + make all redirects able to be relative
 + added test for relative redirection in ResourceService

Signed-off-by: Greg Wilkins <gregw@webtide.com>
@gregw gregw requested a review from joakime September 22, 2021 22:25
@joakime
Copy link
Contributor

joakime commented Sep 23, 2021

Need to fix the license header

Copy link
Contributor

@joakime joakime left a comment

Choose a reason for hiding this comment

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

License header needs to be fixed

Fix #6860 IPv6 format by adding an extensible HttpChannel method

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
# Conflicts:
#	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
#	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
Fix #6860 IPv6 format by adding an extensible HttpChannel method

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
# Conflicts:
#	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
#	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
@gregw gregw requested a review from joakime September 23, 2021 00:16
@gregw gregw merged commit aac366c into jetty-10.0.x Sep 23, 2021
@gregw gregw deleted the jetty-10.0.x-6883-welcome-redirect branch September 23, 2021 05:38
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.

Welcome file redirects do not honor the relativeRedirectAllowed option
2 participants