RequestFactory: drops complete cookie/post when contain invalid chars…

… (+ is faster)
nette · Dec 27, 2014 · 49e4e26 · 49e4e26
1 parent 93c3f35
commit 49e4e26
Showing 1 changed file with 5 additions and 15 deletions.
diff --git a/src/Http/RequestFactory.php b/src/Http/RequestFactory.php
@@ -112,22 +112,12 @@ public function createHttpRequest()
 
 		// remove invalid characters
 		if (!$this->binary) {
-			$list = array(& $post, & $cookies);
-			while (list($key, $val) = each($list)) {
-				foreach ($val as $k => $v) {
-					if (is_string($k) && (!preg_match(self::CHARS, $k) || preg_last_error())) {
-						unset($list[$key][$k]);
-
-					} elseif (is_array($v)) {
-						$list[$key][$k] = $v;
-						$list[] = & $list[$key][$k];
-
-					} elseif (!preg_match(self::CHARS, $v) || preg_last_error()) {
-						$list[$key][$k] = '';
-					}
-				}
+			if (!preg_match(self::CHARS, rawurldecode(http_build_query($post))) || preg_last_error()) {
+				$post = array();
+			}
+			if (!preg_match(self::CHARS, rawurldecode(http_build_query($cookies))) || preg_last_error()) {
+				$cookies = array();
 			}
-			unset($list, $key, $val, $k, $v);
 		}