Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1773032 by Jorrit: Fixed Non-standard and pointless name attribute added to Content-Type header.

merge-requests/26/head
David Rothstein 2012-09-15 17:47:36 -04:00
parent 4d392996a2
commit e218effd9d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/file.inc
View File

@ -2489,7 +2489,7 @@ function file_get_content_headers($file) {
} }
return array( return array(
'Content-Type' => $type . '; name="' . $name . '"', 'Content-Type' => $type,
'Content-Length' => $file->filesize, 'Content-Length' => $file->filesize,
'Content-Disposition' => $disposition . '; filename="' . $name . '"', 'Content-Disposition' => $disposition . '; filename="' . $name . '"',
'Cache-Control' => 'private', 'Cache-Control' => 'private',

2
modules/image/image.test
View File

@ -748,7 +748,7 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
if ($scheme == 'private') { if ($scheme == 'private') {
// Only verify HTTP headers when using private scheme and the headers are // Only verify HTTP headers when using private scheme and the headers are
// sent by Drupal. // 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->assertEqual($this->drupalGetHeader('Content-Disposition'), 'inline; filename="' . $test_image->filename . '"', t('Content-Disposition header was sent.'));
$this->assertEqual($this->drupalGetHeader('Cache-Control'), 'private', t('Cache-Control header was sent.')); $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'private', t('Cache-Control header was sent.'));