Merge branch '6.1.x'

Author: snicoll

spring-web/src/main/java/org/springframework/http/client/ReactorNettyClientRequestFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -175,7 +175,7 @@ public void setReadTimeout(Duration readTimeout) {
 
 	/**
 	 * Set the timeout for the HTTP exchange in milliseconds.
-	 * <p>Default is 30 seconds.
+	 * <p>Default is 5 seconds.
 	 */
 	public void setExchangeTimeout(long exchangeTimeout) {
 		Assert.isTrue(exchangeTimeout > 0, "Timeout must be a positive value");
@@ -184,7 +184,7 @@ public void setExchangeTimeout(long exchangeTimeout) {
 
 	/**
 	 * Set the timeout for the HTTP exchange.
-	 * <p>Default is 30 seconds.
+	 * <p>Default is 5 seconds.
 	 */
 	public void setExchangeTimeout(Duration exchangeTimeout) {
 		Assert.notNull(exchangeTimeout, "ExchangeTimeout must not be null");