Merge branch '2.2.x' into 2.3.x

Closes gh-23555

Author: wilkinsona

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyEmbeddedErrorHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -17,6 +17,9 @@
 package org.springframework.boot.web.embedded.jetty;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -37,6 +40,8 @@
  */
 class JettyEmbeddedErrorHandler extends ErrorPageErrorHandler {
 
+	private static final Set<String> HANDLED_HTTP_METHODS = new HashSet<>(Arrays.asList("GET", "POST", "HEAD"));
+
 	@Override
 	public boolean errorPageForMethod(String method) {
 		return true;
@@ -45,7 +50,9 @@ public boolean errorPageForMethod(String method) {
 	@Override
 	public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
 			throws IOException {
-		baseRequest.setMethod("GET");
+		if (!HANDLED_HTTP_METHODS.contains(baseRequest.getMethod())) {
+			baseRequest.setMethod("GET");
+		}
 		super.doError(target, baseRequest, request, response);
 	}