Merge 4.5

Conflicts:
	inc/display.php
	templates/post_reply.html
	templates/post_thread.html

1 files changed, 23 insertions, 1 deletions

diff --git a/inc/functions.php b/inc/functions.php
index db9c91b0..70f15c59 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- *  Copyright (c) 2010-2013 Tinyboard Development Group
+ *  Copyright (c) 2010-2014 Tinyboard Development Group
  */
 
 if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
@@ -546,6 +546,28 @@ function file_write($path, $data, $simple = false, $skip_purge = false) {
 	if (!fclose($fp))
 		error('Unable to close file: ' . $path);
 
+	/**
+	 * Create gzipped file.
+	 *
+	 * When writing into a file foo.bar and the size is larger or equal to 1
+	 * KiB, this also produces the gzipped version foo.bar.gz
+	 *
+	 * This is useful with nginx with gzip_static on.
+	 */
+	if ($config['gzip_static']) {
+		$gzpath = "$path.gz";
+
+		if ($bytes & ~0x3ff) {  // if ($bytes >= 1024)
+			if (file_put_contents($gzpath, gzencode($data), $simple ? 0 : LOCK_EX) === false)
+				error("Unable to write to file: $gzpath");
+			if (!touch($gzpath, filemtime($path), fileatime($path)))
+				error("Unable to touch file: $gzpath");
+		}
+		else {
+			@unlink($gzpath);
+		}
+	}
+
 	if (!$skip_purge && isset($config['purge'])) {
 		// Purge cache
 		if (basename($path) == $config['file_index']) {