diff --git a/src/Http/RequestFactory.php b/src/Http/RequestFactory.php
index 7752654e..bb7a6edf 100644
--- a/src/Http/RequestFactory.php
+++ b/src/Http/RequestFactory.php
@@ -19,32 +19,12 @@
 class RequestFactory extends Nette\Object
 {
 	/** @internal */
-	const NONCHARS = '#[^\x09\x0A\x0D\x20-\x7E\xA0-\x{10FFFF}]#u';
-
-	/** @var array */
-	public $urlFilters = array(
-		'path' => array('#/{2,}#' => '/'), // '%20' => ''
-		'url' => array(), // '#[.,)]\z#' => ''
-	);
-
-	/** @var bool */
-	private $binary = FALSE;
+	const CHARS = '#^[\x09\x0A\x0D\x20-\x7E\xA0-\x{10FFFF}]++\z#u';
 
 	/** @var array */
 	private $proxies = array();
 
 
-	/**
-	 * @param  bool
-	 * @return self
-	 */
-	public function setBinary($binary = TRUE)
-	{
-		$this->binary = (bool) $binary;
-		return $this;
-	}
-
-
 	/**
 	 * @param  array|string
 	 * @return self
@@ -69,60 +49,50 @@ public function createHttpRequest()
 		$url->setPassword(isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '');
 
 		// host & port
-		if ((isset($_SERVER[$tmp = 'HTTP_HOST']) || isset($_SERVER[$tmp = 'SERVER_NAME']))
-			&& preg_match('#^([a-z0-9_.-]+|\[[a-f0-9:]+\])(:\d+)?\z#i', $_SERVER[$tmp], $pair)
-		) {
-			$url->setHost(strtolower($pair[1]));
-			if (isset($pair[2])) {
-				$url->setPort(substr($pair[2], 1));
-			} elseif (isset($_SERVER['SERVER_PORT'])) {
-				$url->setPort($_SERVER['SERVER_PORT']);
+		if (isset($_SERVER[$tmp = 'HTTP_HOST']) || isset($_SERVER[$tmp = 'SERVER_NAME'])) {
+			if (preg_match('#^([a-z0-9_.-]+|\[[a-f0-9:]+\])(:\d+)?\z#i', $_SERVER[$tmp], $pair)) {
+				$url->setHost(strtolower($pair[1]));
+				if (isset($pair[2])) {
+					$url->setPort(substr($pair[2], 1));
+				} elseif (isset($_SERVER['SERVER_PORT'])) {
+					$url->setPort($_SERVER['SERVER_PORT']);
+				}
+			} else {
+				throw new \Exception(); // TODO
 			}
 		}
 
 		// path & query
-		if (isset($_SERVER['REQUEST_URI'])) { // Apache, IIS 6.0
-			$requestUrl = $_SERVER['REQUEST_URI'];
-
-		} elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0 (PHP as CGI ?)
-			$requestUrl = $_SERVER['ORIG_PATH_INFO'];
-			if (isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] != '') {
-				$requestUrl .= '?' . $_SERVER['QUERY_STRING'];
+		if (isset($_SERVER['REQUEST_URI'])) {
+			$pos = strpos($_SERVER['REQUEST_URI'], '?');
+			if ($pos !== FALSE) {
+				$url->setPath(substr($_SERVER['REQUEST_URI'], 0, $pos));
+				$url->setQuery(substr($_SERVER['REQUEST_URI'], $pos + 1));
+			} else {
+				$url->setPath($_SERVER['REQUEST_URI']);
 			}
-		} else {
-			$requestUrl = '';
 		}
 
-		$requestUrl = Strings::replace($requestUrl, $this->urlFilters['url']);
-		$tmp = explode('?', $requestUrl, 2);
-		$url->setPath(Strings::replace($tmp[0], $this->urlFilters['path']));
-		$url->setQuery(isset($tmp[1]) ? $tmp[1] : '');
-
-		// normalized url
 		$url->canonicalize();
-		$url->setPath(Strings::fixEncoding($url->getPath()));
-
-		// detect script path
-		if (isset($_SERVER['SCRIPT_NAME'])) {
-			$script = $_SERVER['SCRIPT_NAME'];
-		} elseif (isset($_SERVER['DOCUMENT_ROOT'], $_SERVER['SCRIPT_FILENAME'])
-			&& strncmp($_SERVER['DOCUMENT_ROOT'], $_SERVER['SCRIPT_FILENAME'], strlen($_SERVER['DOCUMENT_ROOT'])) === 0
-		) {
-			$script = '/' . ltrim(strtr(substr($_SERVER['SCRIPT_FILENAME'], strlen($_SERVER['DOCUMENT_ROOT'])), '\\', '/'), '/');
-		} else {
-			$script = '/';
+		$path = $url->getPath();
+		if (!preg_match(self::CHARS, $path) || preg_last_error()) {
+			throw new \Exception();
 		}
 
-		$path = strtolower($url->getPath()) . '/';
-		$script = strtolower($script) . '/';
-		$max = min(strlen($path), strlen($script));
-		for ($i = 0; $i < $max; $i++) {
-			if ($path[$i] !== $script[$i]) {
+		// detect script path
+		$script = isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : '/';
+		$max = min(strlen($path), strlen($script)) - 1;
+		for ($i = 0, $j = 0; $i <= $max; $i++) {
+			if ($path[$i] !== $script[$i] && strcasecmp($path[$i], $script[$i])) {
 				break;
 			} elseif ($path[$i] === '/') {
-				$url->setScriptPath(substr($url->getPath(), 0, $i + 1));
+				$j = $i;
+			} elseif ($i == $max) {
+				$j = $i + 1;
 			}
 		}
+		$url->setScriptPath(substr($path, 0, $j + 1));
+
 
 		// GET, POST, COOKIE
 		$useFilter = (!in_array(ini_get('filter.default'), array('', 'unsafe_raw')) || ini_get('filter.default_flags'));
@@ -137,36 +107,34 @@ public function createHttpRequest()
 		$gpc = (bool) get_magic_quotes_gpc();
 
 		// remove fucking quotes, control characters and check encoding
-		if ($gpc || !$this->binary) {
-			$list = array(& $query, & $post, & $cookies);
-			while (list($key, $val) = each($list)) {
-				foreach ($val as $k => $v) {
-					unset($list[$key][$k]);
-
-					if ($gpc) {
-						$k = stripslashes($k);
-					}
+		$list = array(& $query, & $post, & $cookies);
+		while (list($key, $val) = each($list)) {
+			foreach ($val as $k => $v) {
+				unset($list[$key][$k]);
+
+				if ($gpc) {
+					$k = stripslashes($k);
+				}
+
+				if (is_string($k) && (!preg_match(self::CHARS, $k) || preg_last_error())) {
+					// invalid key -> ignore
+
+				} elseif (is_array($v)) {
+					$list[$key][$k] = $v;
+					$list[] = & $list[$key][$k];
 
-					if (!$this->binary && is_string($k) && (preg_match(self::NONCHARS, $k) || preg_last_error())) {
-						// invalid key -> ignore
-
-					} elseif (is_array($v)) {
-						$list[$key][$k] = $v;
-						$list[] = & $list[$key][$k];
-
-					} else {
-						if ($gpc && !$useFilter) {
-							$v = stripSlashes($v);
-						}
-						if (!$this->binary && (preg_match(self::NONCHARS, $v) || preg_last_error())) {
-							$v = '';
-						}
-						$list[$key][$k] = $v;
+				} else {
+					if ($gpc && !$useFilter) {
+						$v = stripslashes($v);
 					}
+					if (!preg_match(self::CHARS, $v) || preg_last_error()) {
+						$v = '';
+					}
+					$list[$key][$k] = $v;
 				}
 			}
-			unset($list, $key, $val, $k, $v);
 		}
+		unset($list, $key, $val, $k, $v);
 
 
 		// FILES and create FileUpload objects
@@ -174,7 +142,7 @@ public function createHttpRequest()
 		$list = array();
 		if (!empty($_FILES)) {
 			foreach ($_FILES as $k => $v) {
-				if (!$this->binary && is_string($k) && (preg_match(self::NONCHARS, $k) || preg_last_error())) {
+				if (is_string($k) && (!preg_match(self::CHARS, $k) || preg_last_error())) {
 					continue;
 				}
 				$v['@'] = & $files[$k];
@@ -190,7 +158,7 @@ public function createHttpRequest()
 				if ($gpc) {
 					$v['name'] = stripSlashes($v['name']);
 				}
-				if (!$this->binary && (preg_match(self::NONCHARS, $v['name']) || preg_last_error())) {
+				if (!preg_match(self::CHARS, $v['name']) || preg_last_error()) {
 					$v['name'] = '';
 				}
 				if ($v['error'] !== UPLOAD_ERR_NO_FILE) {
@@ -200,7 +168,7 @@ public function createHttpRequest()
 			}
 
 			foreach ($v['name'] as $k => $foo) {
-				if (!$this->binary && is_string($k) && (preg_match(self::NONCHARS, $k) || preg_last_error())) {
+				if (is_string($k) && (!preg_match(self::CHARS, $k) || preg_last_error())) {
 					continue;
 				}
 				$list[] = array(
@@ -248,11 +216,14 @@ public function createHttpRequest()
 		}
 
 
-		$method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : NULL;
-		if ($method === 'POST' && isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])
-			&& preg_match('#^[A-Z]+\z#', $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])
-		) {
-			$method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
+		if (isset($_SERVER['REQUEST_METHOD'])) {
+			if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']) && preg_match('#^[A-Z]+\z#', $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+				$method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
+			} else {
+				$method = $_SERVER['REQUEST_METHOD'];
+			}
+		} else {
+			$method = NULL;
 		}
 
 		// raw body
diff --git a/tests/Http/Request.request.phpt b/tests/Http/Request.request.phpt
index 56337c25..7daf5e69 100644
--- a/tests/Http/Request.request.phpt
+++ b/tests/Http/Request.request.phpt
@@ -15,18 +15,18 @@ require __DIR__ . '/../bootstrap.php';
 $_SERVER = array(
 	'HTTPS' => 'On',
 	'HTTP_HOST' => 'nette.org:8080',
-	'QUERY_STRING' => 'x param=val.&pa%%72am=val2&param3=v%20a%26l%3Du%2Be)',
+	'QUERY_STRING' => 'x param=val.&pa%%72am=val2&param3=v%20a%26l%3Du%2Be',
 	'REMOTE_ADDR' => '192.168.188.66',
 	'REQUEST_METHOD' => 'GET',
-	'REQUEST_URI' => '/file.php?x param=val.&pa%%72am=val2&param3=v%20a%26l%3Du%2Be)',
+	'REQUEST_URI' => '/file.php?x param=val.&pa%%72am=val2&param3=v%20a%26l%3Du%2Be',
 	'SCRIPT_FILENAME' => '/public_html/www/file.php',
 	'SCRIPT_NAME' => '/file.php',
 );
 
 test(function() {
 	$factory = new Http\RequestFactory;
-	$factory->urlFilters['path'] = array('#%20#' => '');
-	$factory->urlFilters['url'] = array('#[.,)]\z#' => '');
+//	$factory->urlFilters['path'] = array('#%20#' => '');
+//	$factory->urlFilters['url'] = array('#[.,)]\z#' => '');
 	$request = $factory->createHttpRequest();
 
 	Assert::same( 'GET',  $request->getMethod() );
@@ -54,8 +54,6 @@ test(function() {
 
 test(function() {
 	$factory = new Http\RequestFactory;
-	$factory->urlFilters['path'] = array();
-	$factory->urlFilters['url'] = array();
 	$request = $factory->createHttpRequest();
 
 	Assert::same( 'https',  $request->getUrl()->scheme );
@@ -64,11 +62,11 @@ test(function() {
 	Assert::same( 'nette.org',  $request->getUrl()->host );
 	Assert::same( 8080,  $request->getUrl()->port );
 	Assert::same( '/file.php',  $request->getUrl()->path );
-	Assert::same( 'x param=val.&pa%ram=val2&param3=v a%26l%3Du%2Be)',  $request->getUrl()->query );
+	Assert::same( 'x param=val.&pa%ram=val2&param3=v a%26l%3Du%2Be',  $request->getUrl()->query );
 	Assert::same( '',  $request->getUrl()->fragment );
 	Assert::same( 'val.',  $request->getQuery('x_param') );
 	Assert::same( 'val2',  $request->getQuery('pa%ram') );
-	Assert::same( 'v a&l=u+e)',  $request->getQuery('param3') );
+	Assert::same( 'v a&l=u+e',  $request->getQuery('param3') );
 	if (!function_exists('apache_request_headers')) {
 		Assert::same( 'nette.org:8080',  $request->headers['host'] );
 	}
diff --git a/tests/Http/RequestFactory.host.phpt b/tests/Http/RequestFactory.host.phpt
index 76d52d09..49277752 100644
--- a/tests/Http/RequestFactory.host.phpt
+++ b/tests/Http/RequestFactory.host.phpt
@@ -11,43 +11,75 @@ use Nette\Http\RequestFactory,
 require __DIR__ . '/../bootstrap.php';
 
 
-$_SERVER = array(
-	'HTTP_HOST' => 'localhost',
-);
-$factory = new RequestFactory;
-Assert::same( 'http://localhost/', (string) $factory->createHttpRequest()->getUrl() );
-
-
-$_SERVER = array(
-	'HTTP_HOST' => 'www-x.nette.org',
-);
-$factory = new RequestFactory;
-Assert::same( 'http://www-x.nette.org/', (string) $factory->createHttpRequest()->getUrl() );
-
-
-$_SERVER = array(
-	'HTTP_HOST' => '192.168.0.1:8080',
-);
-$factory = new RequestFactory;
-Assert::same( 'http://192.168.0.1:8080/', (string) $factory->createHttpRequest()->getUrl() );
-
-
-$_SERVER = array(
-	'HTTP_HOST' => '[::1aF]:8080',
-);
-$factory = new RequestFactory;
-Assert::same( 'http://[::1af]:8080/', (string) $factory->createHttpRequest()->getUrl() );
-
-
-$_SERVER = array(
-	'HTTP_HOST' => "a.cz\n",
-);
-$factory = new RequestFactory;
-Assert::same( 'http:///', (string) $factory->createHttpRequest()->getUrl() );
+//$_SERVER = array(
+//	'HTTP_HOST' => 'localhost',
+//);
+//$factory = new RequestFactory;
+//Assert::same( 'http://localhost/', (string) $factory->createHttpRequest()->getUrl() );
+//
+//
+//$_SERVER = array(
+//	'HTTP_HOST' => 'www-x.nette.org',
+//);
+//$factory = new RequestFactory;
+//Assert::same( 'http://www-x.nette.org/', (string) $factory->createHttpRequest()->getUrl() );
+//
+//
+//$_SERVER = array(
+//	'HTTP_HOST' => '192.168.0.1:8080',
+//);
+//$factory = new RequestFactory;
+//Assert::same( 'http://192.168.0.1:8080/', (string) $factory->createHttpRequest()->getUrl() );
+//
+//
+//$_SERVER = array(
+//	'HTTP_HOST' => '[::1aF]:8080',
+//);
+//$factory = new RequestFactory;
+//Assert::same( 'http://[::1af]:8080/', (string) $factory->createHttpRequest()->getUrl() );
+//
+//
+//$_SERVER = array(
+//	'HTTP_HOST' => "a.cz\n",
+//);
+//$factory = new RequestFactory;
+//Assert::same( 'http:///', (string) $factory->createHttpRequest()->getUrl() );
+//
+//
+//$_SERVER = array(
+//	'HTTP_HOST' => 'AB',
+//);
+//$factory = new RequestFactory;
+//Assert::same( 'http://ab/', (string) $factory->createHttpRequest()->getUrl() );
+//
+
+//$_SERVER = array(
+//	'HTTP_HOST' => 'a' . str_repeat('.a', 4000000),
+//);
+//
+//$time = -microtime(TRUE);
+//$factory = new RequestFactory;
+//$factory->createHttpRequest();
+//$time += microtime(TRUE);
+//Assert::true( $time < 1 );
+//echo $time;
+
+// Assert::same( 'http://ab/', (string) $factory->createHttpRequest()->getUrl() );
+
+
+$_SERVER = [
+	'REQUEST_URI' => '/aaaaaaaaaaaaaaaaaaaaaaaaa.php/' . str_repeat('A', 1e6) . '?' . str_repeat('B', 1e6) . '=' . str_repeat('C', 1e6),
+	'SCRIPT_NAME' => '/aaaaaaaaaaaaaaaaaaaaaaaaa.php'
+];
 
 
-$_SERVER = array(
-	'HTTP_HOST' => 'AB',
-);
 $factory = new RequestFactory;
-Assert::same( 'http://ab/', (string) $factory->createHttpRequest()->getUrl() );
+$factory->createHttpRequest();
+
+$time = -microtime(TRUE);
+for ($i = 0; $i < 10; $i++) {
+	$factory = new RequestFactory;
+	$factory->createHttpRequest();
+}
+$time += microtime(TRUE);
+printf("Time: %.2f ms\n", $time * 1e3);