Skip to content

Commit 528b2fc

Browse files
authored
Merge pull request #1812 from mugdha273/UNDERTOW-2476
[UNDERTOW-2476]-Create a default constant for UndertowOptions.ALLOW_UNKNOWN_PROTOCOLS
2 parents f1b7021 + fae9e3e commit 528b2fc

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

core/src/main/java/io/undertow/UndertowOptions.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,10 @@ public class UndertowOptions {
275275
@Deprecated(forRemoval = true)
276276
public static final Option<Boolean> ENABLE_CONNECTOR_STATISTICS = ENABLE_STATISTICS;
277277

278+
/**
279+
* Default value of {@link #ALLOW_UNKNOWN_PROTOCOLS} option.
280+
*/
281+
public static final Boolean DEFAULT_ALLOW_UNKNOWN_PROTOCOLS = false;
278282

279283
/**
280284
* If unknown protocols should be allowed. The known protocols are:
@@ -285,8 +289,8 @@ public class UndertowOptions {
285289
* HTTP/2.0
286290
*
287291
* If this is false then requests that specify any other protocol will be rejected with a 400
288-
*
289-
* Defaults to false
292+
* <p>
293+
* Defaults to {@link #DEFAULT_ALLOW_UNKNOWN_PROTOCOLS}
290294
*/
291295
public static final Option<Boolean> ALLOW_UNKNOWN_PROTOCOLS = Option.simple(UndertowOptions.class, "ALLOW_UNKNOWN_PROTOCOLS", Boolean.class);
292296

core/src/main/java/io/undertow/server/protocol/http/HttpReadListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ final class HttpReadListener implements ChannelListener<ConduitStreamSourceChann
9999
this.maxEntitySize = connection.getUndertowOptions().get(UndertowOptions.MAX_ENTITY_SIZE, UndertowOptions.DEFAULT_MAX_ENTITY_SIZE);
100100
this.recordRequestStartTime = connection.getUndertowOptions().get(UndertowOptions.RECORD_REQUEST_START_TIME, false);
101101
this.requireHostHeader = connection.getUndertowOptions().get(UndertowOptions.REQUIRE_HOST_HTTP11, true);
102-
this.allowUnknownProtocols = connection.getUndertowOptions().get(UndertowOptions.ALLOW_UNKNOWN_PROTOCOLS, false);
102+
this.allowUnknownProtocols = connection.getUndertowOptions().get(UndertowOptions.ALLOW_UNKNOWN_PROTOCOLS, UndertowOptions.DEFAULT_ALLOW_UNKNOWN_PROTOCOLS);
103103
int requestParseTimeout = connection.getUndertowOptions().get(UndertowOptions.REQUEST_PARSE_TIMEOUT, -1);
104104
int requestIdleTimeout = connection.getUndertowOptions().get(UndertowOptions.NO_REQUEST_TIMEOUT, -1);
105105
if(requestIdleTimeout < 0 && requestParseTimeout < 0) {

0 commit comments

Comments
 (0)