Commit fabf7081 authored by ken restivo's avatar ken restivo

Use http_status() instead of homegrowing it. Adapt http_status to handle replies with data.

parent d11e80e1
......@@ -320,17 +320,18 @@ function xml_status($st, $message = '') {
killme();
}
/**
* @brief Send HTTP status header and exit.
* @brief Send HTTP status header
*
* @param int $val
* integer HTTP status result value
* @param string $msg
* optional message
* @returns (does not return, process is terminated)
* @returns nil
*/
function http_status_exit($val, $msg = '') {
function http_status($val, $msg = '') {
if ($val >= 400)
$msg = (($msg) ? $msg : 'Error');
if ($val >= 200 && $val < 300)
......@@ -338,10 +339,26 @@ function http_status_exit($val, $msg = '') {
logger('http_status_exit ' . $val . ' ' . $msg);
header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg);
}
/**
* @brief Send HTTP status header and exit.
*
* @param int $val
* integer HTTP status result value
* @param string $msg
* optional message
* @returns (does not return, process is terminated)
*/
function http_status_exit($val, $msg = '') {
http_status($val, $msg);
killme();
}
// convert an XML document to a normalised, case-corrected array
// used by webfinger
......
<?php /** @file */
require_once("include/network.php");
function system_down() {
header('HTTP/1.0 503 Service Unavailable');
http_status(503, 'Service Unavailable');
echo <<< EOT
<html>
<head><title>System Unavailable</title></head>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment