jenkins-bot has submitted this change and it was merged.

Change subject: Fixed loading of stat cache entries into the wrong key
......................................................................


Fixed loading of stat cache entries into the wrong key

* Silly bug from 2afdc066f52b54faf63f9c980f7ef6a7841dd094 which caused HEAD
  requests. Probably missed in local testing due to memcached.

Change-Id: I3b82ffe964e252eafa5254f7752e5ba45b49ba0e
(cherry picked from commit 519883bd67c960998e8cb2eb0cda52f3764192f7)
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/filebackend/SwiftFileBackend.php 
b/includes/filebackend/SwiftFileBackend.php
index ec2e2c0..1787d66 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -1706,7 +1706,7 @@
                $relPath = substr( $path, $this->suffixStart );
                if ( is_array( $stat ) ) {
                        $storageDir = rtrim( $this->params['dir'], '/' );
-                       $this->backend->loadListingStatInternal( 
"$storageDir/$path", $stat );
+                       $this->backend->loadListingStatInternal( 
"$storageDir/$relPath", $stat );
                }
                return $relPath;
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/94481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b82ffe964e252eafa5254f7752e5ba45b49ba0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf3
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to