Merge pull request #1513 from TomasHofman/UNDERTOW-2305

fl4via · web-flow · commit e6acf35d0815 · 2023-10-10T10:07:42.000-03:00
UNDERTOW-2305 Fix NPE in Http2ClearClientProvider
diff --git a/core/src/main/java/io/undertow/client/http2/Http2ClearClientProvider.java b/core/src/main/java/io/undertow/client/http2/Http2ClearClientProvider.java
@@ -170,7 +170,7 @@ public static String createSettingsFrame(OptionMap options, ByteBufferPool buffe
             if (options.contains(UndertowOptions.HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE)) {
                 pushOption(currentBuffer, Http2Setting.SETTINGS_MAX_HEADER_LIST_SIZE, options.get(UndertowOptions.HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE));
             } else if(options.contains(UndertowOptions.MAX_HEADER_SIZE)) {
-                pushOption(currentBuffer, Http2Setting.SETTINGS_MAX_HEADER_LIST_SIZE, options.get(UndertowOptions.HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE));
+                pushOption(currentBuffer, Http2Setting.SETTINGS_MAX_HEADER_LIST_SIZE, options.get(UndertowOptions.MAX_HEADER_SIZE));
             }
             currentBuffer.flip();
             return FlexBase64.encodeStringURL(currentBuffer, false);

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public static String createSettingsFrame(OptionMap options, ByteBufferPool buffe`
`170`	`170`	`if (options.contains(UndertowOptions.HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE)) {`
`171`	`171`	`pushOption(currentBuffer, Http2Setting.SETTINGS_MAX_HEADER_LIST_SIZE, options.get(UndertowOptions.HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE));`
`172`	`172`	`} else if(options.contains(UndertowOptions.MAX_HEADER_SIZE)) {`
`173`		`- pushOption(currentBuffer, Http2Setting.SETTINGS_MAX_HEADER_LIST_SIZE, options.get(UndertowOptions.HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE));`
	`173`	`+ pushOption(currentBuffer, Http2Setting.SETTINGS_MAX_HEADER_LIST_SIZE, options.get(UndertowOptions.MAX_HEADER_SIZE));`
`174`	`174`	`}`
`175`	`175`	`currentBuffer.flip();`
`176`	`176`	`return FlexBase64.encodeStringURL(currentBuffer, false);`