Treat empty Accept header like any content type

laravel · Dec 26, 2017 · 3dc1dfe · 3dc1dfe
1 parent 1f6b32e
commit 3dc1dfe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php b/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
@@ -53,6 +53,10 @@ public function wantsAnyContentType()
     {
         $acceptable = $this->getAcceptableContentTypes();
 
+        if (count($acceptable) === 0) {
+            return true;
+        }
+
         return isset($acceptable[0]) && ($acceptable[0] === '*/*' || $acceptable[0] === '*');
     }
 

diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php
@@ -594,6 +594,9 @@ public function testExpectsJson()
         $request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => '*/*', 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest']);
         $this->assertTrue($request->expectsJson());
 
+        $request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => null, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest']);
+        $this->assertTrue($request->expectsJson());
+
         $request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => '*/*', 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest', 'HTTP_X_PJAX' => 'true']);
         $this->assertFalse($request->expectsJson());