Merge branch 'master' into multi_app_dir

Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php

1 files changed, 28 insertions, 0 deletions

diff --git a/lib/request.php b/lib/request.php
new file mode 100644
index 00000000000..0b5aaf8ef30
--- /dev/null
+++ b/lib/request.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class OC_Request {
+	static public function isNoCache() {
+		if (!isset($_SERVER['HTTP_CACHE_CONTROL'])) {
+			return false;
+		}
+		return $_SERVER['HTTP_CACHE_CONTROL'] == 'no-cache';
+	}
+
+	static public function acceptGZip() {
+		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
+			return false;
+		}
+		$HTTP_ACCEPT_ENCODING = $_SERVER["HTTP_ACCEPT_ENCODING"];
+		if( strpos($HTTP_ACCEPT_ENCODING, 'x-gzip') !== false )
+			return 'x-gzip';
+		else if( strpos($HTTP_ACCEPT_ENCODING,'gzip') !== false )
+			return 'gzip';
+		return false;
+	}
+}