Merge "Make UploadBase use TempFSFile to wrap the temporary file"

diff --cc includes/filerepo/FileRepo.php
Simple merge

diff --cc includes/filerepo/file/LocalFile.php
Simple merge

diff --cc includes/upload/UploadBase.php
Simple merge

diff --cc includes/upload/UploadFromChunks.php
index 8ee0845,aa23c7d..ebb4ebb
--- 1/includes/upload/UploadFromChunks.php
--- 2/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@@ -145,13 -145,11 +145,12 @@@ class UploadFromChunks extends UploadFr
                if ( !$status->isOk() ) {
                        return $status;
                }
 +
                wfDebugLog( 'fileconcatenate', "Combined $i chunks in $tAmount seconds." );
  
-               // File system path
-               $this->mTempPath = $tmpPath;
-               // Since this was set for the last chunk previously
-               $this->mFileSize = filesize( $this->mTempPath );
+               // File system path of the actual full temp file
+               $this->setTempFile( $tmpPath );
+ 
                $ret = $this->verifyUpload();
                if ( $ret['status'] !== UploadBase::OK ) {
                        wfDebugLog( 'fileconcatenate', "Verification failed for chunked upload" );