[8.x] Make accept header comparison case-insensitive (laravel#39413)

* Make accept header comparison case-insensitive * Update comment and ref link * Update InteractsWithContentTypes.php Co-authored-by: Taylor Otwell <taylor@laravel.com>
chu121su12 · Oct 30, 2021 · 516b824 · 516b824
1 parent a28aa9c
commit 516b824
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php b/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
@@ -37,7 +37,7 @@ public function wantsJson()
     {
         $acceptable = $this->getAcceptableContentTypes();
 
-        return isset($acceptable[0]) && Str::contains($acceptable[0], ['/json', '+json']);
+        return isset($acceptable[0]) && Str::contains(strtolower($acceptable[0]), ['/json', '+json']);
     }
 
     /**
@@ -62,6 +62,10 @@ public function accepts($contentTypes)
             }
 
             foreach ($types as $type) {
+                $accept = strtolower($accept);
+
+                $type = strtolower($type);
+
                 if ($this->matchesType($accept, $type) || $accept === strtok($type, '/').'/*') {
                     return true;
                 }
@@ -95,6 +99,10 @@ public function prefers($contentTypes)
                     $type = $mimeType;
                 }
 
+                $accept = strtolower($accept);
+
+                $type = strtolower($type);
+
                 if ($this->matchesType($type, $accept) || $accept === strtok($type, '/').'/*') {
                     return $contentType;
                 }

diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php
@@ -1006,6 +1006,21 @@ public function testBadAcceptHeader()
         $this->assertFalse($request->accepts('text/html'));
     }
 
+    public function testCaseInsensitiveAcceptHeader()
+    {
+        $request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => 'APPLICATION/JSON']);
+        $this->assertTrue($request->accepts(['text/html', 'application/json']));
+
+        $request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => 'AppLiCaTion/JsOn']);
+        $this->assertTrue($request->accepts(['text/html', 'application/json']));
+
+        $request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => 'APPLICATION/*']);
+        $this->assertTrue($request->accepts(['text/html', 'application/json']));
+
+        $request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => 'APPLICATION/JSON']);
+        $this->assertTrue($request->expectsJson());
+    }
+
     public function testSessionMethod()
     {
         $this->expectException(RuntimeException::class);