Skip to content

Commit 5376f71

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: fixed undefined variable Fixed the phpDoc of UserInterface fixed APCu dep version Added support for the `0.0.0.0/0` trusted proxy [DoctrineBridge][Validator] >= 2.3 Pass association instead of ID as argument [HttpKernel] Lookup the response even if the lock was released after 2 seconds
2 parents 5e44e95 + c9c279b commit 5376f71

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

DependencyInjection/Configuration.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ public function getConfigTreeBuilder()
139139
}
140140

141141
if (false !== strpos($v, '/')) {
142+
if ('0.0.0.0/0' === $v) {
143+
return false;
144+
}
145+
142146
list($v, $mask) = explode('/', $v, 2);
143147

144148
if (strcmp($mask, (int) $mask) || $mask < 1 || $mask > (false !== strpos($v, ':') ? 128 : 32)) {

Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public function getTestValidTrustedProxiesData()
6666
array(array(), array()),
6767
array(array('10.0.0.0/8'), array('10.0.0.0/8')),
6868
array(array('::ffff:0:0/96'), array('::ffff:0:0/96')),
69+
array(array('0.0.0.0/0'), array('0.0.0.0/0')),
6970
);
7071
}
7172

0 commit comments

Comments
 (0)