jenkins-bot has submitted this change and it was merged.
Change subject: Fixed use of X-Newest in Swift backend
......................................................................
Fixed use of X-Newest in Swift backend
Change-Id: I9c9572269cd5366272070ccba954c3bd417aa696
(cherry picked from commit 688200c607640e77029d171803a7a72832519aa2)
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filebackend/SwiftFileBackend.php
b/includes/filebackend/SwiftFileBackend.php
index 7cfd1d7..6b2030d 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -638,7 +638,7 @@
list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) =
$this->http->run( array(
'method' => 'HEAD',
'url' => $this->storageUrl( $auth, $srcCont,
$srcRel ),
- 'headers' => $this->authTokenHeaders( $auth )
+ 'headers' => $this->authTokenHeaders( $auth ) +
$this->headersFromParams( $params )
) );
if ( $rcode === 200 || $rcode === 204 ) {
// Update the object if it is missing some headers
@@ -1185,7 +1185,7 @@
protected function headersFromParams( array $params ) {
$hdrs = array();
if ( !empty( $params['latest'] ) ) {
- $hdrs[] = 'X-Newest: true';
+ $hdrs['x-newest'] = 'true';
}
return $hdrs;
--
To view, visit https://gerrit.wikimedia.org/r/107753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c9572269cd5366272070ccba954c3bd417aa696
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf10
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
