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
Merge "WLFilters: adapt to customized watchlist-details"
[lhc/web/wiklou.git]
/
includes
/
libs
/
HttpStatus.php
diff --git
a/includes/libs/HttpStatus.php
b/includes/libs/HttpStatus.php
index
442298a
..
27f8728
100644
(file)
--- a/
includes/libs/HttpStatus.php
+++ b/
includes/libs/HttpStatus.php
@@
-32,7
+32,7
@@
class HttpStatus {
* @return string|null Message, or null if $code is not known
*/
public static function getMessage( $code ) {
* @return string|null Message, or null if $code is not known
*/
public static function getMessage( $code ) {
- static $statusMessage =
array(
+ static $statusMessage =
[
100 => 'Continue',
101 => 'Switching Protocols',
102 => 'Processing',
100 => 'Continue',
101 => 'Switching Protocols',
102 => 'Processing',
@@
-83,7
+83,7
@@
class HttpStatus {
505 => 'HTTP Version Not Supported',
507 => 'Insufficient Storage',
511 => 'Network Authentication Required',
505 => 'HTTP Version Not Supported',
507 => 'Insufficient Storage',
511 => 'Network Authentication Required',
-
)
;
+
]
;
return isset( $statusMessage[$code] ) ? $statusMessage[$code] : null;
}
return isset( $statusMessage[$code] ) ? $statusMessage[$code] : null;
}
@@
-101,8
+101,12
@@
class HttpStatus {
return false;
}
return false;
}
+ MediaWiki\HeaderCallback::warnIfHeadersSent();
if ( $version === null ) {
if ( $version === null ) {
- $version = isset( $_SERVER['SERVER_PROTOCOL'] ) && $_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.0' ? '1.0' : '1.1';
+ $version = isset( $_SERVER['SERVER_PROTOCOL'] ) &&
+ $_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.0' ?
+ '1.0' :
+ '1.1';
}
header( "HTTP/$version $code $message" );
}
header( "HTTP/$version $code $message" );