Skip to content

Commit

Permalink
Fix distribution test
Browse files Browse the repository at this point in the history
Signed-off-by: Olivier Lamy <olamy@apache.org>
  • Loading branch information
olamy committed Aug 20, 2024
1 parent 69285c1 commit 7ed5807
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
<servlet-class>org.eclipse.jetty.ee10.proxy.ProxyServlet$Transparent</servlet-class>
<init-param>
<param-name>proxyTo</param-name>
<param-value>https://javadoc.jetty.org/jetty-12/index.html</param-value>
<param-value>https://javadoc.jetty.org/</param-value>
</init-param>
<init-param>
<param-name>hostHeader</param-name>
<param-value>www.eclipse.org</param-value>
<param-value>javadoc.jetty.org</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
<async-supported>true</async-supported>
</servlet>

<servlet-mapping>
<servlet-name>JavadocTransparentProxy</servlet-name>
<url-pattern>/current/*</url-pattern>
<url-pattern>/jetty-12/*</url-pattern>
</servlet-mapping>

</web-app>
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
<servlet-class>org.eclipse.jetty.ee9.proxy.ProxyServlet$Transparent</servlet-class>
<init-param>
<param-name>proxyTo</param-name>
<param-value>https://javadoc.jetty.org/jetty-12/index.html</param-value>
<param-value>https://javadoc.jetty.org/</param-value>
</init-param>
<init-param>
<param-name>hostHeader</param-name>
<param-value>www.eclipse.org</param-value>
<param-value>javadoc.jetty.org</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
<async-supported>true</async-supported>
</servlet>

<servlet-mapping>
<servlet-name>JavadocTransparentProxy</servlet-name>
<url-pattern>/current/*</url-pattern>
<url-pattern>/jetty-12/*</url-pattern>
</servlet-mapping>

</web-app>
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ public void testWebAppWithProxyAndJPMS(String env) throws Exception
assertTrue(run2.awaitConsoleLogsFor("Started oejs.Server@", START_TIMEOUT, TimeUnit.SECONDS));

startHttpClient(() -> new HttpClient(new HttpClientTransportOverHTTP(1)));
ContentResponse response = client.GET("http://localhost:" + port + "/proxy/current/");
ContentResponse response = client.GET("http://localhost:" + port + "/proxy/jetty-12/index.html");
assertEquals(HttpStatus.OK_200, response.getStatus(), () ->
{
StringBuilder rawResponse = new StringBuilder();
Expand Down

0 comments on commit 7ed5807

Please sign in to comment.