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 "Fix for Bug 63980 - Comparison of limits in pingLimiter is incorrect"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
WebRequestTest.php
diff --git
a/tests/phpunit/includes/WebRequestTest.php
b/tests/phpunit/includes/WebRequestTest.php
index
45fe3e9
..
12d7d2a
100644
(file)
--- a/
tests/phpunit/includes/WebRequestTest.php
+++ b/
tests/phpunit/includes/WebRequestTest.php
@@
-10,10
+10,12
@@
class WebRequestTest extends MediaWikiTestCase {
parent::setUp();
$this->oldServer = $_SERVER;
parent::setUp();
$this->oldServer = $_SERVER;
+ IP::clearCaches();
}
protected function tearDown() {
$_SERVER = $this->oldServer;
}
protected function tearDown() {
$_SERVER = $this->oldServer;
+ IP::clearCaches();
parent::tearDown();
}
parent::tearDown();
}
@@
-113,7
+115,7
@@
class WebRequestTest extends MediaWikiTestCase {
'wgUsePrivateIPs' => $private,
'wgHooks' => array(
'IsTrustedProxy' => array(
'wgUsePrivateIPs' => $private,
'wgHooks' => array(
'IsTrustedProxy' => array(
- function( &$ip, &$trusted ) use ( $xffList ) {
+ function
( &$ip, &$trusted ) use ( $xffList ) {
$trusted = $trusted || in_array( $ip, $xffList );
return true;
}
$trusted = $trusted || in_array( $ip, $xffList );
return true;
}