From 57f8d0ec93dc6b5bb72188830067ccfc2f52f6bb Mon Sep 17 00:00:00 2001 From: Aaron Date: Tue, 31 Jul 2012 10:53:27 -0700 Subject: [PATCH] [FileBackend] Made swift handle unknown content types better. Change-Id: I50a5c17c40152a9e469a54bdd70a8408c57ebd50 --- includes/filerepo/backend/SwiftFileBackend.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/includes/filerepo/backend/SwiftFileBackend.php b/includes/filerepo/backend/SwiftFileBackend.php index 5f82a90ef9..30634409c3 100644 --- a/includes/filerepo/backend/SwiftFileBackend.php +++ b/includes/filerepo/backend/SwiftFileBackend.php @@ -188,6 +188,9 @@ class SwiftFileBackend extends FileBackendStore { $obj->set_etag( md5( $params['content'] ) ); // Use the same content type as StreamFile for security $obj->content_type = StreamFile::contentTypeFromPath( $params['dst'] ); + if ( !strlen( $obj->content_type ) ) { // special case + $obj->content_type = 'unknown/unknown'; + } if ( !empty( $params['async'] ) ) { // deferred $handle = $obj->write_async( $params['content'] ); $status->value = new SwiftFileOpHandle( $this, $params, 'Create', $handle ); @@ -267,6 +270,9 @@ class SwiftFileBackend extends FileBackendStore { $obj->set_etag( md5_file( $params['src'] ) ); // Use the same content type as StreamFile for security $obj->content_type = StreamFile::contentTypeFromPath( $params['dst'] ); + if ( !strlen( $obj->content_type ) ) { // special case + $obj->content_type = 'unknown/unknown'; + } if ( !empty( $params['async'] ) ) { // deferred wfSuppressWarnings(); $fp = fopen( $params['src'], 'rb' ); -- 2.20.1