Seb35 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/299404
Change subject: Add status 404 in case of nonexistent wiki
......................................................................
Add status 404 in case of nonexistent wiki
---
M src/MediaWikiFarm.php
M src/main.php
2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm
refs/changes/04/299404/1
diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 317a22e..c02bbb8 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -73,6 +73,8 @@
# Check existence
if( !$wgMediaWikiFarm->checkExistence() ) {
+ $version = $_SERVER['SERVER_PROTOCOL'] &&
$_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.0' ? '1.0' : '1.1';
+ header( "HTTP/$version 404 Not Found" );
echo 'Error: unknown wiki.';
exit;
}
@@ -96,7 +98,7 @@
if( self::$self == null ) {
# Warning: do not use $GLOBALS['_SERVER']['HTTP_HOST']:
bug with PHP7: it is not initialised in early times of a script
- if( is_null( $host ) ) $host = $_SERVER['HTTP_HOST'];
+ if( is_null( $host ) ) $host = $_SERVER['HTTP_HOST'] ?
$_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];
self::$self = new self( $host,
$wgMediaWikiFarmConfigDir, $wgMediaWikiFarmCodeDir, $wgMediaWikiFarmCacheDir );
}
return self::$self;
diff --git a/src/main.php b/src/main.php
index 3768f45..9490f48 100644
--- a/src/main.php
+++ b/src/main.php
@@ -22,6 +22,8 @@
if( !$wgMediaWikiFarm->checkExistence() ) {
+ $version = $_SERVER['SERVER_PROTOCOL'] && $_SERVER['SERVER_PROTOCOL']
=== 'HTTP/1.0' ? '1.0' : '1.1';
+ header( "HTTP/$version 404 Not Found" );
echo 'Error: unknown wiki.';
exit;
}
--
To view, visit https://gerrit.wikimedia.org/r/299404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11a65c269aa5f4d18fe6fc7994cfd02271cadbd8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 <seb35wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
