MDL-20695 no need to log prefetch attempts, we can not prevent them

hyokwang-ahn · Oct 31, 2009 · 47c2811 · 47c2811
1 parent ccda6d6
commit 47c2811
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/setup.php b/lib/setup.php
@@ -171,7 +171,9 @@
 // wwwroot is mandatory
 if (!isset($CFG->wwwroot)) {
     // trigger_error() is not correct here, no need to log this
-    die('Fatal: $CFG->wwwroot is not configured! Exiting.');
+    header($_SERVER['SERVER_PROTOCOL'] . ' 503 Service Unavailable');
+    echo('Fatal: $CFG->wwwroot is not configured! Exiting.');
+    exit(1);
 }
 
 /// Detect CLI scripts - CLI scripts are executed from command line, do not have session and we do not want HTML in output
@@ -230,8 +232,8 @@
 /// http://www.google.com/webmasters/faq.html#prefetchblock
     if (!empty($_SERVER['HTTP_X_moz']) && $_SERVER['HTTP_X_moz'] === 'prefetch'){
         header($_SERVER['SERVER_PROTOCOL'] . ' 404 Prefetch Forbidden');
-        trigger_error('Prefetch request forbidden.');
-        exit;
+        echo('Prefetch request forbidden.');
+        exit(1);
     }
 
 /// Define admin directory