Configure a default timeout for HTTP connections at 60s

[quix0rs-gnu-social.git] / lib / servererroraction.php

diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index c8e3067b825c7098d27a8372cd3652bcfbada196..8ca281614b86de301c628c3cfca3fbb1ed593e5b 100644 (file)
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -29,11 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/error.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Class for displaying HTTP server errors
@@ -68,32 +64,21 @@ class ServerErrorAction extends ErrorAction
 
         $this->default = 500;
 
-        // Server errors must be logged.
-        $log = "ServerErrorAction: $code $message";
-        if ($ex) {
-            $log .= "\n" . $ex->getTraceAsString();
-        }
-        common_log(LOG_ERR, $log);
-    }
-
-    // XXX: Should these error actions even be invokable via URI?
-
-    protected function handle()
-    {
-        parent::handle();
-
-        $this->code = $this->trimmed('code');
-
-        if (!$this->code || $code < 500 || $code > 599) {
+        if (!$this->code || $this->code < 500 || $this->code > 599) {
             $this->code = $this->default;
         }
 
-        $this->message = $this->trimmed('message');
-
         if (!$this->message) {
             $this->message = "Server Error $this->code";
         }
 
+        // Server errors must be logged.
+        $log = "ServerErrorAction: $code $message";
+        if ($ex) {
+            $log .= "\n" . $ex->getTraceAsString();
+        }
+        common_log(LOG_ERR, $log);
+
         $this->showPage();
     }