diff --git a/pom.xml b/pom.xml index 28e5bbd8..e5389081 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ org.springframework.cloud spring-cloud-build - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java index fc0cdf68..e0bda2e8 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java @@ -734,6 +734,7 @@ public class GatewayAutoConfiguration { webSocketClient.setMaxFramePayloadLength( properties.getWebsocket().getMaxFramePayloadLength()); } + webSocketClient.setHandlePing(properties.getWebsocket().isProxyPing()); return webSocketClient; } diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java index 6d4f7082..b97d6ffa 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java @@ -603,6 +603,9 @@ public class HttpClientProperties { /** Max frame payload length. */ private Integer maxFramePayloadLength; + /** Proxy ping frames to downstream services, defaults to true. */ + private boolean proxyPing = true; + public Integer getMaxFramePayloadLength() { return this.maxFramePayloadLength; } @@ -611,10 +614,19 @@ public class HttpClientProperties { this.maxFramePayloadLength = maxFramePayloadLength; } + public boolean isProxyPing() { + return proxyPing; + } + + public void setProxyPing(boolean proxyPing) { + this.proxyPing = proxyPing; + } + @Override public String toString() { return new ToStringCreator(this) - .append("maxFramePayloadLength", maxFramePayloadLength).toString(); + .append("maxFramePayloadLength", maxFramePayloadLength) + .append("proxyPing", proxyPing).toString(); } } diff --git a/spring-cloud-gateway-dependencies/pom.xml b/spring-cloud-gateway-dependencies/pom.xml index 2fa58fa2..394c7088 100644 --- a/spring-cloud-gateway-dependencies/pom.xml +++ b/spring-cloud-gateway-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.1.RELEASE + 2.2.3.BUILD-SNAPSHOT