Merge branch '2.0.x'

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java

@@ -32,6 +32,7 @@ import org.springframework.boot.autoconfigure.web.ResourceProperties;
 import org.springframework.boot.web.reactive.error.ErrorAttributes;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.InvalidMediaTypeException;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.server.RequestPredicate;
@@ -184,11 +185,16 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
 	 */
 	protected RequestPredicate acceptsTextHtml() {
 		return (serverRequest) -> {
-			List<MediaType> acceptedMediaTypes = serverRequest.headers().accept();
+			try {
-			acceptedMediaTypes.remove(MediaType.ALL);
+				List<MediaType> acceptedMediaTypes = serverRequest.headers().accept();
-			MediaType.sortBySpecificityAndQuality(acceptedMediaTypes);
+				acceptedMediaTypes.remove(MediaType.ALL);
-			return acceptedMediaTypes.stream()
+				MediaType.sortBySpecificityAndQuality(acceptedMediaTypes);
-					.anyMatch(MediaType.TEXT_HTML::isCompatibleWith);
+				return acceptedMediaTypes.stream()
+						.anyMatch(MediaType.TEXT_HTML::isCompatibleWith);
+			}
+			catch (InvalidMediaTypeException ex) {
+				return false;
+			}
 		};
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandlerIntegrationTests.java

@@ -279,6 +279,16 @@ public class DefaultErrorWebExceptionHandlerIntegrationTests {
 				});
 	}
 
+	@Test
+	public void invalidAcceptMediaType() {
+		this.contextRunner.run((context) -> {
+			WebTestClient client = WebTestClient.bindToApplicationContext(context)
+					.build();
+			client.get().uri("/notfound").header("Accept", "v=3.0").exchange()
+					.expectStatus().isEqualTo(HttpStatus.NOT_FOUND);
+		});
+	}
+
 	@Configuration
 	public static class Application {