makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-28 04:48:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge PR #1097 branch 'igorw/ticket/11212' into develop

Browse source 
* igorw/ticket/11212:
  [ticket/11212] Cosmetic surgery done right
  [ticket/11212] Cosmetics
  [ticket/11212] Rename get_http_version to phpbb_request_http_version()
  [ticket/11212] Allow dispatcher to be absent during garbage_collection()
  [ticket/11212] Do not rely on $request in send_status_line()
This commit is contained in:
Oleg Pudeyev 2012-11-17 12:24:15 -05:00
commit e07db8fb8c
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
phpBB/includes/functions.php
View file

@ -2858,8 +2858,6 @@ function meta_refresh($time, $url, $disable_cd_check = false)
*/ */
function send_status_line($code, $message) function send_status_line($code, $message)
{ {
global $request;
if (substr(strtolower(@php_sapi_name()), 0, 3) === 'cgi') if (substr(strtolower(@php_sapi_name()), 0, 3) === 'cgi')
{ {
// in theory, we shouldn't need that due to php doing it. Reality offers a differing opinion, though // in theory, we shouldn't need that due to php doing it. Reality offers a differing opinion, though
@ -2867,18 +2865,35 @@ function send_status_line($code, $message)
} }
else else
{ {
if ($request->server('SERVER_PROTOCOL')) $version = phpbb_request_http_version();
{
$version = $request->server('SERVER_PROTOCOL');
}
else
{
$version = 'HTTP/1.0';
}
header("$version $code $message", true, $code); header("$version $code $message", true, $code);
} }
} }
/**
* Returns the HTTP version used in the current request.
*
* Handles the case of being called before $request is present,
* in which case it falls back to the $_SERVER superglobal.
*
* @return string HTTP version
*/
function phpbb_request_http_version()
{
global $request;
if ($request && $request->server('SERVER_PROTOCOL'))
{
return $request->server('SERVER_PROTOCOL');
}
else if (isset($_SERVER['SERVER_PROTOCOL']))
{
return $_SERVER['SERVER_PROTOCOL'];
}
return 'HTTP/1.0';
}
//Form validation //Form validation
@ -5333,7 +5348,10 @@ function garbage_collection()
* @event core.garbage_collection * @event core.garbage_collection
* @since 3.1-A1 * @since 3.1-A1
*/ */
$phpbb_dispatcher->dispatch('core.garbage_collection'); if (!empty($phpbb_dispatcher))
{
$phpbb_dispatcher->dispatch('core.garbage_collection');
}
// Unload cache, must be done before the DB connection if closed // Unload cache, must be done before the DB connection if closed
if (!empty($cache)) if (!empty($cache))