6 files changed, 70 insertions, 10 deletions
diff --git a/build/build.xml b/build/build.xml
index 1c0acc8f37..b0a9190898 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.1.3" />
-	<property name="prevversion" value="3.1.3-RC2" />
-	<property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.1.0, 3.1.1, 3.1.2, 3.1.3-RC1" />
+	<property name="newversion" value="3.1.4-dev" />
+	<property name="prevversion" value="3.1.3" />
+	<property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.1.0, 3.1.1, 3.1.2" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 9f408f4702..321a87b4b0 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.1.3');
+define('PHPBB_VERSION', '3.1.4-dev');
 
 // QA-related
 // define('PHPBB_QA', 1);
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/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 3a0b71fe00..a39bb365d6 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -273,7 +273,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.4-dev');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
 
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,