4 files changed, 66 insertions, 6 deletions
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
index fbeae50f55..254e65ae3d 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -210,11 +210,6 @@ function send_file_to_browser($attachment, $upload_dir, $category)
 		}
 	}
 
-	if ($size)
-	{
-		header("Content-Length: $size");
-	}
-
 	// Close the db connection before sending the file etc.
 	file_gc(false);
 
@@ -238,6 +233,11 @@ function send_file_to_browser($attachment, $upload_dir, $category)
 			exit;
 		}
 
+		if ($size)
+		{
+			header("Content-Length: $size");
+		}
+
 		// Try to deliver in chunks
 		@set_time_limit(0);
 
diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
index 8865d37712..93ea46ca60 100644
--- a/phpBB/phpbb/search/fulltext_native.php
+++ b/phpBB/phpbb/search/fulltext_native.php
@@ -300,7 +300,7 @@ class fulltext_native extends \phpbb\search\base
 		$this->search_query = $keywords;
 
 		$exact_words = array();
-		preg_match_all('#([^\\s+\\-|*()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
+		preg_match_all('#([^\\s+\\-|()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
 		$exact_words = $exact_words[1];
 
 		$common_ids = $words = array();
diff --git a/tests/search/fixtures/posts.xml b/tests/search/fixtures/posts.xml
index 7b249ee303..16232b8f39 100644
--- a/tests/search/fixtures/posts.xml
+++ b/tests/search/fixtures/posts.xml
@@ -19,6 +19,11 @@
 			<value>commonword</value>
 			<value>commonword</value>
 		</row>
+		<row>
+			<value>baaz</value>
+			<value>baaz</value>
+			<value>baaz</value>
+		</row>
 	</table>
 	<table name="phpbb_search_wordlist">
 		<column>word_id</column>
@@ -39,5 +44,10 @@
 			<value>commonword</value>
 			<value>1</value>
 		</row>
+		<row>
+			<value>4</value>
+			<value>baaz</value>
+			<value>0</value>
+		</row>
 	</table>
 </dataset>
diff --git a/tests/search/native_test.php b/tests/search/native_test.php
index f681a62fce..61fde7d098 100644
--- a/tests/search/native_test.php
+++ b/tests/search/native_test.php
@@ -35,6 +35,8 @@ class phpbb_search_native_test extends phpbb_search_test_case
 		$this->db = $this->new_dbal();
 		$error = null;
 		$class = self::get_search_wrapper('\phpbb\search\fulltext_native');
+		$config['fulltext_native_min_chars'] = 2;
+		$config['fulltext_native_max_chars'] = 14;
 		$this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user);
 	}
 
@@ -56,6 +58,54 @@ class phpbb_search_native_test extends phpbb_search_test_case
 				array(),
 			),
 			array(
+				'baaz*',
+				'all',
+				true,
+				array('\'baaz%\''),
+				array(),
+				array(),
+			),
+			array(
+				'ba*az',
+				'all',
+				true,
+				array('\'ba%az\''),
+				array(),
+				array(),
+			),
+			array(
+				'ba*z',
+				'all',
+				true,
+				array('\'ba%z\''),
+				array(),
+				array(),
+			),
+			array(
+				'baa* baaz*',
+				'all',
+				true,
+				array('\'baa%\'', '\'baaz%\''),
+				array(),
+				array(),
+			),
+			array(
+				'ba*z baa*',
+				'all',
+				true,
+				array('\'ba%z\'', '\'baa%\''),
+				array(),
+				array(),
+			),
+			array(
+				'baaz* commonword',
+				'all',
+				true,
+				array('\'baaz%\''),
+				array(),
+				array('commonword'),
+			),
+			array(
 				'foo bar',
 				'all',
 				true,