D18138.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D18138.id.diff
View Options

	diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
	--- a/src/applications/files/storage/PhabricatorFile.php
	+++ b/src/applications/files/storage/PhabricatorFile.php
	@@ -393,6 +393,7 @@
	$tmp = new TempFile();
	Filesystem::writeFile($tmp, $data);
	$file->setMimeType(Filesystem::getMimeType($tmp));
	+ unset($tmp);
	}

	try {
	diff --git a/src/applications/files/uploadsource/PhabricatorFileUploadSource.php b/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
	--- a/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
	+++ b/src/applications/files/uploadsource/PhabricatorFileUploadSource.php
	@@ -186,12 +186,18 @@
	$actual_length = strlen($data);
	$rope->removeBytesFromHead($actual_length);

	- $chunk_data = PhabricatorFile::newFromFileData(
	- $data,
	- array(
	- 'name' => $file->getMonogram().'.chunk-'.$offset,
	- 'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
	- ));
	+ $params = array(
	+ 'name' => $file->getMonogram().'.chunk-'.$offset,
	+ 'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
	+ );
	+
	+ // If this isn't the initial chunk, provide a dummy MIME type so we do not
	+ // try to detect it. See T12857.
	+ if ($offset > 0) {
	+ $params['mime-type'] = 'application/octet-stream';
	+ }
	+
	+ $chunk_data = PhabricatorFile::newFromFileData($data, $params);

	$chunk = PhabricatorFileChunk::initializeNewChunk(
	$file->getStorageHandle(),