diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-02-10 00:20:34 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-02-10 00:20:34 +0100 |
| commit | 5c009997b2d8778537723e9e52575fb71c6f7675 (patch) | |
| tree | e881709316998d5ea86269d8bc49d48914d536e6 | |
| parent | df78a3a62df1c8da5f3a9ff2cfef5815aaf4909c (diff) | |
| parent | 0e861ac3ab0513ec1c00354bfc8fc8492aa6573c (diff) | |
| download | forums-5c009997b2d8778537723e9e52575fb71c6f7675.tar forums-5c009997b2d8778537723e9e52575fb71c6f7675.tar.gz forums-5c009997b2d8778537723e9e52575fb71c6f7675.tar.bz2 forums-5c009997b2d8778537723e9e52575fb71c6f7675.tar.xz forums-5c009997b2d8778537723e9e52575fb71c6f7675.zip | |
Merge branch 'ticket/p/10029' into develop-olympus
* ticket/p/10029:
[ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 9a8cc5d6b3..398a02380b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2631,8 +2631,14 @@ function send_status_line($code, $message) } else { - if (isset($_SERVER['HTTP_VERSION'])) + if (!empty($_SERVER['SERVER_PROTOCOL'])) { + $version = $_SERVER['SERVER_PROTOCOL']; + } + else if (!empty($_SERVER['HTTP_VERSION'])) + { + // I cannot remember where I got this from. + // This code path may never be reachable in reality. $version = $_SERVER['HTTP_VERSION']; } else |