dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated dev dependancy phpunit/phpunit from v4.8.35 to v4.8.36
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
FileRepo.php
diff --git
a/includes/filerepo/FileRepo.php
b/includes/filerepo/FileRepo.php
index
8edf81f
..
5005280
100644
(file)
--- a/
includes/filerepo/FileRepo.php
+++ b/
includes/filerepo/FileRepo.php
@@
-776,7
+776,7
@@
class FileRepo {
public function getDescriptionRenderUrl( $name, $lang = null ) {
$query = 'action=render';
if ( !is_null( $lang ) ) {
public function getDescriptionRenderUrl( $name, $lang = null ) {
$query = 'action=render';
if ( !is_null( $lang ) ) {
- $query .= '&uselang=' .
$lang
;
+ $query .= '&uselang=' .
urlencode( $lang )
;
}
if ( isset( $this->scriptDirUrl ) ) {
return $this->makeUrl(
}
if ( isset( $this->scriptDirUrl ) ) {
return $this->makeUrl(
@@
-1602,9
+1602,15
@@
class FileRepo {
$path = $this->resolveToStoragePath( $virtualUrl );
$params = [ 'src' => $path, 'headers' => $headers, 'options' => $optHeaders ];
$path = $this->resolveToStoragePath( $virtualUrl );
$params = [ 'src' => $path, 'headers' => $headers, 'options' => $optHeaders ];
+ // T172851: HHVM does not flush the output properly, causing OOM
+ ob_start( null, 1048576 );
+ ob_implicit_flush( true );
+
$status = $this->newGood();
$status->merge( $this->backend->streamFile( $params ) );
$status = $this->newGood();
$status->merge( $this->backend->streamFile( $params ) );
+ ob_end_flush();
+
return $status;
}
return $status;
}