DRY determining server protocol
Signed-off-by: Daniel Morris <daniel@honestempire.com>
diff --git a/system/core/Common.php b/system/core/Common.php
index 57374b0..09b73ef 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -488,13 +488,9 @@
{
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 847b1be..378eec0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -231,6 +231,7 @@
- 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
------------------