Fallback to application/octet-stream if we are unable to guess the …

…content type for a multipart file upload (#568)
guzzle · Aug 3, 2023 · ed1315d · ed1315d
1 parent c47b9eb
commit ed1315d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/MultipartStream.php b/src/MultipartStream.php
@@ -137,9 +137,7 @@ private function createElement(string $name, StreamInterface $stream, ?string $f
         // Set a default Content-Type if one was not supplied
         $type = $this->getHeader($headers, 'content-type');
         if (!$type && ($filename === '0' || $filename)) {
-            if ($type = MimeType::fromFilename($filename)) {
-                $headers['Content-Type'] = $type;
-            }
+            $headers['Content-Type'] = MimeType::fromFilename($filename) ?? 'application/octet-stream';
         }
 
         return [$stream, $headers];

diff --git a/tests/MultipartStreamTest.php b/tests/MultipartStreamTest.php
@@ -143,7 +143,7 @@ public function testSerializesFiles(): void
 
         $f3 = Psr7\FnStream::decorate(Psr7\Utils::streamFor('bar'), [
             'getMetadata' => static function (): string {
-                return '/foo/bar.gif';
+                return '/foo/bar.unknown';
             },
         ]);
 
@@ -176,9 +176,9 @@ public function testSerializesFiles(): void
             "\r\n",
             "baz\r\n",
             "--boundary\r\n",
-            "Content-Disposition: form-data; name=\"qux\"; filename=\"bar.gif\"\r\n",
+            "Content-Disposition: form-data; name=\"qux\"; filename=\"bar.unknown\"\r\n",
             "Content-Length: 3\r\n",
-            "Content-Type: image/gif\r\n",
+            "Content-Type: application/octet-stream\r\n",
             "\r\n",
             "bar\r\n",
             "--boundary--\r\n",