diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-06-10 20:00:10 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-06-10 20:00:10 +0000 |
| commit | 05c39fe7a04607ed2fdb07c01f4e24de3c0f9056 (patch) | |
| tree | a53ac9917e4a68c2dcd7fe9d0397d3fdda749581 /includes | |
| parent | d540553f21ea38cdd6dc7f8b3eb73d828668a9fa (diff) | |
| download | brdo-05c39fe7a04607ed2fdb07c01f4e24de3c0f9056.tar.gz brdo-05c39fe7a04607ed2fdb07c01f4e24de3c0f9056.tar.bz2 | |
- Patch #487830 by c960657: fixed a HTTP header and improved the tests.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 6 | ||||
| -rw-r--r-- | includes/common.inc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index b11a8c880..86d80dbdd 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1403,8 +1403,10 @@ function _drupal_bootstrap($phase) { } // Prepare for non-cached page workflow. - ob_start(); - drupal_page_header(); + if ($_SERVER['SERVER_SOFTWARE'] !== 'PHP CLI') { + ob_start(); + drupal_page_header(); + } break; case DRUPAL_BOOTSTRAP_LANGUAGE: diff --git a/includes/common.inc b/includes/common.inc index e4400995e..e1e2053d6 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -834,7 +834,7 @@ function _drupal_log_error($error, $fatal = FALSE) { } if ($fatal) { - drupal_set_header($_SERVER['SERVER_PROTOCOL'] . ' 500 Service unavailable (with message)'); + drupal_set_header('500 Service unavailable (with message)'); } if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') { |