Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Joakim Erdfelt 2022-04-11 10:09:31 -05:00
parent dd2c39ecfe 8bcb842fbb
commit a546006eea
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-p2/pom.xml
View File

@ -12,7 +12,7 @@
<description>Generates a (maven based) P2 Updatesite</description>
<packaging>pom</packaging>
<properties>
<tycho-version>2.7.0</tycho-version>
<tycho-version>2.7.1</tycho-version>
</properties>
<build>
<plugins>
@ -26,9 +26,7 @@
<categoryName>Jetty Bundles</categoryName>
<includeReactor>true</includeReactor>
<includeDependencies>false</includeDependencies>
<!-- due to a bug in tycho PGP signatures should be disabled until it is resolved -->
<!-- https://github.com/eclipse/tycho/issues/808 -->
<includePGPSignature>false</includePGPSignature>
<includePGPSignature>true</includePGPSignature>
</configuration>
<id>maven-p2-site</id>
<phase>prepare-package</phase>

1
jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java
View File

@ -336,6 +336,7 @@ public class ResourceService
if (headers.hasMoreElements())
{
StringBuilder sb = new StringBuilder(key.length() * 2);
sb.append(key);
do
{
sb.append(',').append(headers.nextElement());

10
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
View File

@ -1917,6 +1917,16 @@ public class DefaultServletTest
assertThat(response, containsHeaderValue(HttpHeader.CONTENT_ENCODING, "gzip"));
body = response.getContent();
assertThat(body, containsString("fake gzip"));
rawResponse = connector.getResponse("GET /context/data0.txt HTTP/1.0\r\nHost:localhost:8080\r\nAccept-Encoding:br\r\nAccept-Encoding:gzip, compress\r\n\r\n");
response = HttpTester.parseResponse(rawResponse);
assertThat(response.toString(), response.getStatus(), is(HttpStatus.OK_200));
assertThat(response, containsHeaderValue(HttpHeader.CONTENT_LENGTH, "11"));
assertThat(response, containsHeaderValue(HttpHeader.CONTENT_TYPE, "text/plain"));
assertThat(response, containsHeaderValue(HttpHeader.VARY, "Accept-Encoding"));
assertThat(response, containsHeaderValue(HttpHeader.CONTENT_ENCODING, "br"));
body = response.getContent();
assertThat(body, containsString("fake brotli"));
}
@Test

5
pom.xml
View File

@ -159,7 +159,7 @@
<maven.release.plugin.version>2.5.3</maven.release.plugin.version>
<maven.remote-resources-plugin.version>1.7.0</maven.remote-resources-plugin.version>
<maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
<maven.shade.plugin.version>3.2.4</maven.shade.plugin.version>
<maven.shade.plugin.version>3.3.0</maven.shade.plugin.version>
<maven.site.plugin.version>3.11.0</maven.site.plugin.version>
<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
@ -723,6 +723,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>${maven.shade.plugin.version}</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>