Skip to content

DB-4068 cherry-pick upstream HttpRequest/ObjectDecoder fixes (4.1.25/bdp 6.{0,7,8}) #20

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Apr 8, 2020
Merged

DB-4068 cherry-pick upstream HttpRequest/ObjectDecoder fixes (4.1.25/bdp 6.{0,7,8}) #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
786cb9c
HttpObjectDecoder ignores HTTP trailer header when empty line is rece…
normanmaurer Jan 31, 2019
2e34711
use checkPositive/checkPositiveOrZero (#8835)
thinkerou Feb 4, 2019
9042b29
Use `AppendableCharSequence.charAtUnsafe(int)` in `HttpObjectDecoder`…
idelpivnitskiy Aug 22, 2019
b8c6b07
Correctly handle whitespaces in HTTP header names as defined by RFC72…
normanmaurer Sep 20, 2019
e41f0d3
Detect missing colon when parsing http headers with no value (#9871)
normanmaurer Dec 11, 2019
f68e787
Verify we do not receive multiple content-length headers or a content…
normanmaurer Dec 13, 2019
e325faa
Version bump to 4.1.25.7.dse
dalaro Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.netty</groupId>
<artifactId>netty-parent</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</parent>

<artifactId>netty-all</artifactId>
Expand Down
65 changes: 32 additions & 33 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.25.dse</version>
<version>4.1.25.7.dse</version>
<packaging>pom</packaging>

<name>Netty/BOM</name>
Expand All @@ -49,7 +49,6 @@
<url>https://github.com/netty/netty</url>
<connection>scm:git:git://github.com/netty/netty.git</connection>
<developerConnection>scm:git:ssh://[email protected]/netty/netty.git</developerConnection>
<tag>netty-4.1.25.dse</tag>
</scm>

<developers>
Expand All @@ -69,72 +68,72 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-dns</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-haproxy</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-memcache</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-mqtt</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-redis</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-smtp</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-stomp</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-xml</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand All @@ -144,90 +143,90 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-rxtx</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-sctp</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-udt</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-example</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
<classifier>osx-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
<classifier>osx-x86_64</classifier>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion buffer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.netty</groupId>
<artifactId>netty-parent</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</parent>

<artifactId>netty-buffer</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion codec-dns/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.netty</groupId>
<artifactId>netty-parent</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</parent>

<artifactId>netty-codec-dns</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions codec-dns/src/main/java/io/netty/handler/codec/dns/AbstractDnsRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.net.IDN;

import static io.netty.util.internal.ObjectUtil.checkNotNull;
import static io.netty.util.internal.ObjectUtil.checkPositiveOrZero;

/**
* A skeletal implementation of {@link DnsRecord}.
Expand Down Expand Up @@ -62,9 +63,7 @@ protected AbstractDnsRecord(String name, DnsRecordType type, long timeToLive) {
* @param timeToLive the TTL value of the record
*/
protected AbstractDnsRecord(String name, DnsRecordType type, int dnsClass, long timeToLive) {
if (timeToLive < 0) {
throw new IllegalArgumentException("timeToLive: " + timeToLive + " (expected: >= 0)");
}
checkPositiveOrZero(timeToLive, "timeToLive");
// Convert to ASCII which will also check that the length is not too big.
// See:
// - https://github.com/netty/netty/issues/4937
Expand Down
2 changes: 1 addition & 1 deletion codec-haproxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.netty</groupId>
<artifactId>netty-parent</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</parent>

<artifactId>netty-codec-haproxy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion codec-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.netty</groupId>
<artifactId>netty-parent</artifactId>
<version>4.1.25.6.dse</version>
<version>4.1.25.7.dse</version>
</parent>

<artifactId>netty-codec-http</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,7 @@ private static void validateHeaderNameElement(byte value) {
default:
// Check to see if the character is not an ASCII character, or invalid
if (value < 0) {
throw new IllegalArgumentException("a header name cannot contain non-ASCII character: " +
value);
throw new IllegalArgumentException("a header name cannot contain non-ASCII character: " + value);
}
}
}
Expand Down
Loading