Merge https://github.com/redmatrix/hubzilla into pending_merge

Conflicts:
	version.inc

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