From 9311cd97af5aad24da606e525f7d832868a99786 Mon Sep 17 00:00:00 2001 From: Jorrit Schippers Date: Tue, 4 Sep 2012 09:13:10 +0200 Subject: [PATCH] Issue #1773032 by Jorrit: Removed name attribute from the Content-Type HTTP header. --- core/modules/file/file.module | 2 +- .../Drupal/image/Tests/ImageFieldDisplayTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 3763ea0..a521cc5 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -709,7 +709,7 @@ function file_get_content_headers(File $file) { } return array( - 'Content-Type' => $type . '; name="' . $name . '"', + 'Content-Type' => $type, 'Content-Length' => $file->filesize, 'Content-Disposition' => $disposition . '; filename="' . $name . '"', 'Cache-Control' => 'private', diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php index e65f2fb..601c3c2 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php @@ -77,7 +77,7 @@ class ImageFieldDisplayTest extends ImageFieldTestBase { if ($scheme == 'private') { // Only verify HTTP headers when using private scheme and the headers are // sent by Drupal. - $this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png; name="' . $test_image->filename . '"', t('Content-Type header was sent.')); + $this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png', t('Content-Type header was sent.')); $this->assertEqual($this->drupalGetHeader('Content-Disposition'), 'inline; filename="' . $test_image->filename . '"', t('Content-Disposition header was sent.')); $this->assertTrue(strstr($this->drupalGetHeader('Cache-Control'),'private') !== FALSE, t('Cache-Control header was sent.')); -- 1.7.9.5