diff options
| author |   Igor Wiedler <igor@wiedler.ch> | 2011-02-12 14:56:05 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-02-12 14:56:05 +0100 |
| commit | 2e31dd56dfd9f3cf109fce99270b2961119ccdc0 (patch) | |
| tree | 24b4e944042a05470aa163508d6f148452437b96 /phpBB/includes/functions.php | |
| parent | Merge branch 'ticket/p/10013' into develop (diff) | |
| parent | Merge branch 'ticket/bantu/9805' into develop-olympus (diff) | |
| download | phpbb-2e31dd56dfd9f3cf109fce99270b2961119ccdc0.tar.gz phpbb-2e31dd56dfd9f3cf109fce99270b2961119ccdc0.tar.bz2 phpbb-2e31dd56dfd9f3cf109fce99270b2961119ccdc0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
[ticket/9805] Setup security repository for developers.
[ticket/9805] Move check lower down.
[ticket/9805] Better support for already existing repositories.
[ticket/9805] Add dry-run option.
[ticket/9805] Use getopt(), add a few options, extend show_usage().
[ticket/9805] Script for easily cloning a whole github network.
Diffstat (limited to 'phpBB/includes/functions.php')
| -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 c4be5330bd..056d578e75 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2451,8 +2451,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 |