Merge pull request #2356 from annando/1602-redmatrix-name

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 9fe248e8e2b5329f3b67503a75c74e9a2bc6ef3b..8471735d016af1fd617d908a614c8ded21013db5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -56,10 +56,11 @@ if(!$install) {
        $maxsysload_frontend = intval(get_config('system','maxloadavg_frontend'));
        if($maxsysload_frontend < 1)
                $maxsysload_frontend = 50;
-       if(function_exists('sys_getloadavg')) {
-               $load = sys_getloadavg();
-               if(intval($load[0]) > $maxsysload_frontend) {
-                       logger('system: load ' . $load[0] . ' too high. Service Temporarily Unavailable.');
+
+       $load = current_load();
+       if($load) {
+               if($load > $maxsysload_frontend) {
+                       logger('system: load ' . $load . ' too high. Service Temporarily Unavailable.');
                        header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
                        header('Retry-After: 300');
                        die("System is currently unavailable. Please try again later");
@@ -406,15 +407,6 @@ if(x($_SESSION,'sysmsg_info')) {
 call_hooks('page_end', $a->page['content']);
 
 
-/**
- *
- * Add a place for the pause/resume Ajax indicator
- *
- */
-
-$a->page['content'] .=  '<div id="pause"></div>';
-
-
 /**
  *
  * Add the navigation (menu) template
@@ -555,6 +547,7 @@ EOT;
 $page    = $a->page;
 $profile = $a->profile;
 
+header("X-Friendica-Version: ".FRIENDICA_VERSION);
 header("Content-type: text/html; charset=utf-8");