From 5e4bf57238b230de5f58385ee3a44cb5192bcf92 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Fri, 24 Jul 2015 18:10:43 +0200
Subject: [PATCH 1/1] Release Cubemap 1.2.0.

---
 NEWS      | 20 ++++++++++++++++++++
 version.h |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index ac45dfa..99961ed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+Cubemap 1.2.0, 2015-07-24
+
+  * Add support for server-side prebuffering (force_prebuffering=NNN
+    on a stream to prebuffer that amount of bytes), where Cubemap doesn't
+    send any data before it knows it can send a certain number of
+    bytes without waiting for more from the input (either through
+    giving out old data, waiting for new data, or a combination).
+
+    This is useful when using jwPlayer or <video> in browsers, where
+    the client typically does not wait to fill up its buffer before it
+    starts playing, and thus will stay perenially in a low-buffer state.
+    Effectively it is forcing a certain amount of buffering on the client.
+
+  * Log the client's Referer: and User-Agent: header in the stats file and
+    access log.
+
+  * Time out clients that go more than 60 seconds without sending a request;
+    they could hang in that state for days and months before.
+
+
 Cubemap 1.1.2, 2014-07-07
 
   * Remove some leftover debug code that would cause compile errors.
diff --git a/version.h b/version.h
index 6879a17..2ab6351 100644
--- a/version.h
+++ b/version.h
@@ -3,7 +3,7 @@
 
 // Version number. Don't expect this to change all that often.
 
-#define SERVER_VERSION "1.1.3-pre"
+#define SERVER_VERSION "1.2.0"
 #define SERVER_IDENTIFICATION "Cubemap/" SERVER_VERSION
 
 #endif  // !defined(_VERSION_H)
-- 
2.39.2