aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2015-11-20 21:57:10 -0500
committerAndrew Manning <tamanning@zoho.com>2015-11-20 21:57:10 -0500
commitfee85030933bd15788bde7c0e019803a27a55f84 (patch)
treea2755c3dbd77b3210f2420a162a28030e3fc2865 /include/network.php
parent6083cd255990c82380a85029b3951160eb558ac9 (diff)
parentfabf7081d39481bb22ee27c4beaf96e5529168eb (diff)
downloadvolse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.tar.gz
volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.tar.bz2
volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected
Diffstat (limited to 'include/network.php')
-rw-r--r--include/network.php25
1 files changed, 21 insertions, 4 deletions
diff --git a/include/network.php b/include/network.php
index 65599bd05..026f5ee0a 100644
--- a/include/network.php
+++ b/include/network.php
@@ -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