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:
7f11daf
)
Fix warning "ob_end_flush(): failed to delete and flush buffer" during uploads
author
Edward Chernenko
<edwardspec@gmail.com>
Sun, 1 Apr 2018 21:39:59 +0000
(
00:39
+0300)
committer
Edward Chernenko
<edwardspec@gmail.com>
Sun, 1 Apr 2018 21:39:59 +0000
(
00:39
+0300)
Bug: T186565
Change-Id: Ia4b29611ccee4acac11717f5220ff9e0fdbd55a9
includes/filerepo/FileRepo.php
patch
|
blob
|
history
diff --git
a/includes/filerepo/FileRepo.php
b/includes/filerepo/FileRepo.php
index
e430bc8
..
0c37d78
100644
(file)
--- a/
includes/filerepo/FileRepo.php
+++ b/
includes/filerepo/FileRepo.php
@@
-1634,7
+1634,11
@@
class FileRepo {
$status = $this->newGood();
$status->merge( $this->backend->streamFile( $params ) );
- ob_end_flush();
+ // T186565: Close the buffer, unless it has already been closed
+ // in HTTPFileStreamer::resetOutputBuffers().
+ if ( ob_get_status() ) {
+ ob_end_flush();
+ }
return $status;
}