dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c038b2
)
[FileBackend] Treat NoSuchObjectException as a normal error in streamFile().
author
Aaron Schulz
<aschulz@wikimedia.org>
Sun, 9 Sep 2012 17:54:16 +0000
(10:54 -0700)
committer
Aaron Schulz
<aschulz@wikimedia.org>
Sun, 9 Sep 2012 17:54:16 +0000
(10:54 -0700)
Change-Id: I6b64e524a7f3cba6cabe5282f5915cd05dbf8ad0
includes/filebackend/SwiftFileBackend.php
patch
|
blob
|
history
diff --git
a/includes/filebackend/SwiftFileBackend.php
b/includes/filebackend/SwiftFileBackend.php
index
ab86107
..
2cedb62
100644
(file)
--- a/
includes/filebackend/SwiftFileBackend.php
+++ b/
includes/filebackend/SwiftFileBackend.php
@@
-1023,6
+1023,8
@@
class SwiftFileBackend extends FileBackendStore {
$output = fopen( 'php://output', 'wb' );
$obj = new CF_Object( $cont, $srcRel, false, false ); // skip HEAD
$obj->stream( $output, $this->headersFromParams( $params ) );
+ } catch ( NoSuchObjectException $e ) {
+ $status->fatal( 'backend-fail-stream', $params['src'] );
} catch ( CloudFilesException $e ) { // some other exception?
$this->handleException( $e, $status, __METHOD__, $params );
}