diff options
| author | Daniel Morris <daniel@honestempire.com> | 2012-10-04 22:06:21 +0200 |
|---|---|---|
| committer | Daniel Morris <daniel@honestempire.com> | 2012-10-04 22:06:21 +0200 |
| commit | 6602cd7b7433b1d514b0f944cc9de563133174cf (patch) | |
| tree | 65054cfe9b8d67c5863cdc1f5fa6741dfddc06a7 | |
| parent | 824b4f220ca3dadc8f0945c665a7d7f8105a5dc4 (diff) | |
DRY determining server protocol
Signed-off-by: Daniel Morris <daniel@honestempire.com>
| -rw-r--r-- | system/core/Common.php | 6 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index 57374b07d..09b73ef2e 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -488,13 +488,9 @@ if ( ! function_exists('set_status_header')) { header('Status: '.$code.' '.$text, TRUE); } - elseif ($server_protocol === 'HTTP/1.0') - { - header('HTTP/1.0 '.$code.' '.$text, TRUE, $code); - } else { - header('HTTP/1.1 '.$code.' '.$text, TRUE, $code); + header($server_protocol.' '.$code.' '.$text, TRUE, $code); } } } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 847b1be3e..378eec061 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -231,6 +231,7 @@ Release Date: Not Released - Added method ``strip_image_tags()`` to the :doc:`Security Library <libraries/security>`. - Changed ``_exception_handler()`` to respect php.ini 'display_errors' setting. - Added support for IPv4 range masks (e.g. 192.168.1.1/24) to specify ranges of IP addresses for use with the proxy_ips setting. + - Removed redundant conditional to determine HTTP server protocol in ``set_status_header()`` Bug fixes for 3.0 ------------------ |