Merge pull request #20026 from geoand/#20021

Loosen restriction on casing of the `Accept` header
quarkusio · Sep 20, 2021 · 879c866 · 879c866
2 parents e5b4d79 + b3d5028
commit 879c866
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/...ntime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java b/...ntime/src/main/java/org/jboss/resteasy/reactive/server/handlers/FixedProducesHandler.java
@@ -1,5 +1,6 @@
 package org.jboss.resteasy.reactive.server.handlers;
 
+import java.util.Locale;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
@@ -40,8 +41,15 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti
                 requestContext.setResponseContentType(mediaType);
                 requestContext.setEntityWriter(writer);
             } else {
-                throw new WebApplicationException(
-                        Response.notAcceptable(Variant.mediaTypes(mediaType.getMediaType()).build()).build());
+                // some clients might be sending the header with incorrect casing...
+                String lowercaseAccept = accept.toLowerCase(Locale.ROOT);
+                if (lowercaseAccept.contains(mediaTypeString) || lowercaseAccept.contains(mediaTypeSubstring)) {
+                    requestContext.setResponseContentType(mediaType);
+                    requestContext.setEntityWriter(writer);
+                } else {
+                    throw new WebApplicationException(
+                            Response.notAcceptable(Variant.mediaTypes(mediaType.getMediaType()).build()).build());
+                }
             }
         }
     }