summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hunsaker <danhunsaker@gmail.com>2013-03-04 13:14:22 +0100
committerDaniel Hunsaker <danhunsaker@gmail.com>2013-03-04 13:14:22 +0100
commit8626e93d5b4362c86a58933dda9206ac8810476d (patch)
treefc8e24af0186afcabc7dee57b6c953774c27fbd1
parentb2ac67a3a766ac18f5041eff7a5cbeef7437a184 (diff)
Reverting changes to functions that have no business being used in CLI apps to begin with
Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
-rw-r--r--system/core/Common.php15
-rw-r--r--system/helpers/download_helper.php3
-rw-r--r--system/libraries/Trackback.php6
-rw-r--r--system/libraries/Xmlrpcs.php3
4 files changed, 10 insertions, 17 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index e11668d5f..9baf5e315 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -531,16 +531,13 @@ if ( ! function_exists('set_status_header'))
$server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : FALSE;
- if ( ! headers_sent())
+ if (strpos(php_sapi_name(), 'cgi') === 0)
{
- if (strpos(php_sapi_name(), 'cgi') === 0)
- {
- header('Status: '.$code.' '.$text, TRUE);
- }
- else
- {
- header(($server_protocol ? $server_protocol : 'HTTP/1.1').' '.$code.' '.$text, TRUE, $code);
- }
+ header('Status: '.$code.' '.$text, TRUE);
+ }
+ else
+ {
+ header(($server_protocol ? $server_protocol : 'HTTP/1.1').' '.$code.' '.$text, TRUE, $code);
}
}
}
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index bd3296574..4fe6a0e88 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -141,8 +141,7 @@ if ( ! function_exists('force_download'))
// If we have raw data - just dump it
if ($data !== NULL)
{
- echo $data;
- exit;
+ exit($data);
}
// Flush 1MB chunks of data
diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php
index ecc7129e3..5a45be8dd 100644
--- a/system/libraries/Trackback.php
+++ b/system/libraries/Trackback.php
@@ -211,8 +211,7 @@ class CI_Trackback {
*/
public function send_error($message = 'Incomplete Information')
{
- echo '<?xml version="1.0" encoding="utf-8"?'.">\n<response>\n<error>1</error>\n<message>".$message."</message>\n</response>";
- exit;
+ exit('<?xml version="1.0" encoding="utf-8"?'.">\n<response>\n<error>1</error>\n<message>".$message."</message>\n</response>");
}
// --------------------------------------------------------------------
@@ -227,8 +226,7 @@ class CI_Trackback {
*/
public function send_success()
{
- echo '<?xml version="1.0" encoding="utf-8"?'.">\n<response>\n<error>0</error>\n</response>";
- exit;
+ exit('<?xml version="1.0" encoding="utf-8"?'.">\n<response>\n<error>0</error>\n</response>");
}
// --------------------------------------------------------------------
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
index a6048cb9f..d263d789d 100644
--- a/system/libraries/Xmlrpcs.php
+++ b/system/libraries/Xmlrpcs.php
@@ -170,8 +170,7 @@ class CI_Xmlrpcs extends CI_Xmlrpc {
header('Content-Type: text/xml');
header('Content-Length: '.strlen($payload));
- echo $payload;
- exit;
+ exit($payload);
}
// --------------------------------------------------------------------