Seb35 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/299405
Change subject: Additional checks on the host
......................................................................
Additional checks on the host
---
M src/MediaWikiFarm.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm
refs/changes/05/299405/1
diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index c02bbb8..38cab2b 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -256,7 +256,7 @@
private function __construct( $host, $configDir, $codeDir = null,
$cacheDir = null ) {
# Check parameters
- if( !is_string( $host ) ||
+ if( !is_string( $host ) || $host == '' ||
!(is_string( $configDir ) && is_dir( $configDir )) ||
!(is_null( $codeDir ) xor (is_string( $codeDir ) && is_dir(
$codeDir ))) ||
!(is_null( $cacheDir ) xor is_string( $cacheDir ))
@@ -308,7 +308,7 @@
# For each proposed farm, check if the host matches
foreach( $configs as $regex => $config ) {
- if( !preg_match( '/' . $regex . '/i', $host, $matches )
)
+ if( !preg_match( '/^' . $regex . '$/i', $host, $matches
) )
continue;
# Initialise variables from the host
--
To view, visit https://gerrit.wikimedia.org/r/299405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2280eec0438d303e3bc5ab206e3060f111508bc6
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
