Merge "filebackend: Added supported for retrieving file metadata/headers"

[lhc/web/wiklou.git] / includes / filebackend / SwiftFileBackend.php

diff --git a/includes/filebackend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php
index 037b1c3..d9f4fc8 100644 (file)
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -268,7 +268,7 @@ class SwiftFileBackend extends FileBackendStore {
                $sha1Hash = sha1_file( $params['src'] );
                wfRestoreWarnings();
                if ( $sha1Hash === false ) { // source doesn't exist?
-                       $status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] );
+                       $status->fatal( 'backend-fail-store', $params['src'], $params['dst'] );
 
                        return $status;
                }
@@ -277,7 +277,7 @@ class SwiftFileBackend extends FileBackendStore {
 
                $handle = fopen( $params['src'], 'rb+' );
                if ( $handle === false ) { // source doesn't exist?
-                       $status->fatal( 'backend-fail-copy', $params['src'], $params['dst'] );
+                       $status->fatal( 'backend-fail-store', $params['src'], $params['dst'] );
 
                        return $status;
                }
@@ -1098,7 +1098,11 @@ class SwiftFileBackend extends FileBackendStore {
                        $reqs = $this->http->runMulti( $reqs );
                        foreach ( $reqs as $path => $op ) {
                                list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = $op['response'];
-                               if ( $rcode >= 200 && $rcode <= 299 ) {
+                               fclose( $op['stream'] ); // close open handle
+                               if ( $rcode >= 200 && $rcode <= 299
+                                       // double check that the disk is not full/broken
+                                       && $tmpFile->getSize() == $rhdrs['content-length']
+                               ) {
                                        // good
                                } elseif ( $rcode === 404 ) {
                                        $tmpFiles[$path] = false;
@@ -1107,7 +1111,6 @@ class SwiftFileBackend extends FileBackendStore {
                                        $this->onError( null, __METHOD__,
                                                array( 'src' => $path ) + $ep, $rerr, $rcode, $rdesc );
                                }
-                               fclose( $op['stream'] ); // close open handle
                        }
                }