From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 6 Apr 2013 16:39:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.0.0~209
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=f52f37b4792a117821b2aab6a4213e30996a28b3;hp=75b7556a87926aa4ec3a2ac25c7a06d06c13396c

Merge remote-tracking branch 'origin/master'
---

diff --git a/server.cpp b/server.cpp
index bfdee5a..08f2afd 100644
--- a/server.cpp
+++ b/server.cpp
@@ -263,7 +263,7 @@ void Server::parse_request(Client *client)
 	client->request.clear();
 
 	// Construct the header.
-	client->header = "HTTP/1.0 200 OK\r\nContent-type: todo/fixme\r\n\r\n" +
+	client->header = "HTTP/1.0 200 OK\r\n  Content-type: video/x-flv\r\nCache-Control: no-cache\r\nContent-type: todo/fixme\r\n\r\n" +
 		streams[client->stream_id].header;
 
 	// Switch states.