From: Petr Škoda <commits@skodak.org>
Date: Fri, 26 Jul 2013 14:44:12 +0000 (+0200)
Subject: MDL-40889 prevent 304 when minimising JS
X-Git-Tag: v2.3.9~11
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=ef7c73d5d81a2c3e1755b5b3ae2b38b660c8f1d6

MDL-40889 prevent 304 when minimising JS
---

diff --git a/lib/jslib.php b/lib/jslib.php
index cef5c98ee09..3139e6bae15 100644
--- a/lib/jslib.php
+++ b/lib/jslib.php
@@ -107,6 +107,11 @@ function js_minify($files) {
         return '';
     }
 
+    // We do not really want any 304 here!
+    // There does not seem to be any better way to prevent them here.
+    unset($_SERVER['HTTP_IF_NONE_MATCH']);
+    unset($_SERVER['HTTP_IF_MODIFIED_SINCE']);
+
     if (0 === stripos(PHP_OS, 'win')) {
         Minify::setDocRoot(); // IIS may need help
     }
@@ -130,7 +135,7 @@ function js_minify($files) {
     $error = 'unknown';
     try {
         $result = Minify::serve('Files', $options);
-        if ($result['success']) {
+        if ($result['success'] and $result['statusCode'] == 200) {
             return $result['content'];
         }
     } catch (Exception $e) {