From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 9 Mar 2017 02:51:27 +0000 (-0800)
Subject: Make sure Swift store operations close the source file handle
X-Git-Tag: 1.31.0-rc.0~3815
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=17c686a802016269c69789d92ddedb7c35f5c1a7;p=lhc%2Fweb%2Fwiklou.git

Make sure Swift store operations close the source file handle

Bug: T159607
Change-Id: I9a8907a20ba83f33cc5fc96bc15a1728770f656a
---

diff --git a/includes/libs/filebackend/SwiftFileBackend.php b/includes/libs/filebackend/SwiftFileBackend.php
index c50dfd7245..631f6fd6fa 100644
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@ -348,6 +348,8 @@ class SwiftFileBackend extends FileBackendStore {
 		};
 
 		$opHandle = new SwiftFileOpHandle( $this, $handler, $reqs );
+		$opHandle->resourcesToClose[] = $handle;
+
 		if ( !empty( $params['async'] ) ) { // deferred
 			$status->value = $opHandle;
 		} else { // actually write the object in Swift