makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
# By Jakub Senko
# Via Dhruv Goel (1) and Jakub Senko (1)
* develop-ascraeus:
  [ticket/13045] Remove Pragma headers
This commit is contained in:
Dhruv 2014-09-21 11:31:13 +05:30
commit 93dc33b002
9 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/feed.php
View file

@ -165,7 +165,6 @@ if (defined('DEBUG') && request_var('explain', 0) && $auth->acl_get('a_'))
header('Content-type: text/html; charset=UTF-8'); header('Content-type: text/html; charset=UTF-8');
header('Cache-Control: private, no-cache="set-cookie"'); header('Cache-Control: private, no-cache="set-cookie"');
header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT'); header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
header('Pragma: no-cache');
$mtime = explode(' ', microtime()); $mtime = explode(' ', microtime());
$totaltime = $mtime[0] + $mtime[1] - $starttime; $totaltime = $mtime[0] + $mtime[1] - $starttime;

4
phpBB/includes/acp/acp_database.php
View file

@ -269,7 +269,7 @@ class acp_database
break; break;
} }
header('Pragma: no-cache'); header('Cache-Control: private, no-cache');
header("Content-Type: $mimetype; name=\"$name\""); header("Content-Type: $mimetype; name=\"$name\"");
header("Content-disposition: attachment; filename=$name"); header("Content-disposition: attachment; filename=$name");
@ -510,7 +510,7 @@ class base_extractor
if ($download == true) if ($download == true)
{ {
$name = $filename . $ext; $name = $filename . $ext;
header('Pragma: no-cache'); header('Cache-Control: private, no-cache');
header("Content-Type: $mimetype; name=\"$name\""); header("Content-Type: $mimetype; name=\"$name\"");
header("Content-disposition: attachment; filename=$name"); header("Content-disposition: attachment; filename=$name");

2
phpBB/includes/acp/acp_icons.php
View file

@ -737,7 +737,7 @@ class acp_icons
{ {
garbage_collection(); garbage_collection();
header('Pragma: public'); header('Cache-Control: public');
// Send out the Headers // Send out the Headers
header('Content-Type: text/x-delimtext; name="' . $mode . '.pak"'); header('Content-Type: text/x-delimtext; name="' . $mode . '.pak"');

1
phpBB/includes/functions.php
View file

@ -5068,7 +5068,6 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'Content-type' => 'text/html; charset=UTF-8', 'Content-type' => 'text/html; charset=UTF-8',
'Cache-Control' => 'private, no-cache="set-cookie"', 'Cache-Control' => 'private, no-cache="set-cookie"',
'Expires' => gmdate('D, d M Y H:i:s', time()) . ' GMT', 'Expires' => gmdate('D, d M Y H:i:s', time()) . ' GMT',
'Pragma' => 'no-cache',
); );
if (!empty($user->data['is_bot'])) if (!empty($user->data['is_bot']))
{ {

1
phpBB/includes/functions_acp.php
View file

@ -113,7 +113,6 @@ function adm_page_header($page_title)
'Content-type' => 'text/html; charset=UTF-8', 'Content-type' => 'text/html; charset=UTF-8',
'Cache-Control' => 'private, no-cache="set-cookie"', 'Cache-Control' => 'private, no-cache="set-cookie"',
'Expires' => gmdate('D, d M Y H:i:s', time()) . ' GMT', 'Expires' => gmdate('D, d M Y H:i:s', time()) . ' GMT',
'Pragma' => 'no-cache',
); );
/** /**

4
phpBB/includes/functions_compress.php
View file

@ -509,7 +509,7 @@ class compress_zip extends compress
$mimetype = 'application/zip'; $mimetype = 'application/zip';
header('Pragma: no-cache'); header('Cache-Control: private, no-cache');
header("Content-Type: $mimetype; name=\"$download_name.zip\""); header("Content-Type: $mimetype; name=\"$download_name.zip\"");
header("Content-disposition: attachment; filename=$download_name.zip"); header("Content-disposition: attachment; filename=$download_name.zip");
@ -757,7 +757,7 @@ class compress_tar extends compress
break; break;
} }
header('Pragma: no-cache'); header('Cache-Control: private, no-cache');
header("Content-Type: $mimetype; name=\"$download_name$this->type\""); header("Content-Type: $mimetype; name=\"$download_name$this->type\"");
header("Content-disposition: attachment; filename=$download_name$this->type"); header("Content-disposition: attachment; filename=$download_name$this->type");

6
phpBB/includes/functions_download.php
View file

@ -45,7 +45,7 @@ function send_avatar_to_browser($file, $browser)
if ((@file_exists($file_path) && @is_readable($file_path)) && !headers_sent()) if ((@file_exists($file_path) && @is_readable($file_path)) && !headers_sent())
{ {
header('Pragma: public'); header('Cache-Control: public');
$image_data = @getimagesize($file_path); $image_data = @getimagesize($file_path);
header('Content-Type: ' . image_type_to_mime_type($image_data[2])); header('Content-Type: ' . image_type_to_mime_type($image_data[2]));
@ -175,7 +175,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)
} }
// Now the tricky part... let's dance // Now the tricky part... let's dance
header('Pragma: public'); header('Cache-Control: public');
// Send out the Headers. Do not set Content-Disposition to inline please, it is a security measure for users using the Internet Explorer. // Send out the Headers. Do not set Content-Disposition to inline please, it is a security measure for users using the Internet Explorer.
header('Content-Type: ' . $attachment['mimetype']); header('Content-Type: ' . $attachment['mimetype']);
@ -420,7 +420,7 @@ function set_modified_headers($stamp, $browser)
{ {
send_status_line(304, 'Not Modified'); send_status_line(304, 'Not Modified');
// seems that we need those too ... browsers // seems that we need those too ... browsers
header('Pragma: public'); header('Cache-Control: public');
header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 31536000) . ' GMT'); header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 31536000) . ' GMT');
return true; return true;
} }

2
phpBB/includes/ucp/ucp_pm_viewfolder.php
View file

@ -383,7 +383,7 @@ function view_folder($id, $mode, $folder_id, $folder)
break; break;
} }
header('Pragma: no-cache'); header('Cache-Control: private, no-cache');
header("Content-Type: $mimetype; name=\"data.$filetype\""); header("Content-Type: $mimetype; name=\"data.$filetype\"");
header("Content-disposition: attachment; filename=data.$filetype"); header("Content-disposition: attachment; filename=data.$filetype");
echo $string; echo $string;

1
phpBB/install/index.php
View file

@ -468,7 +468,6 @@ class module
header('Content-type: text/html; charset=UTF-8'); header('Content-type: text/html; charset=UTF-8');
header('Cache-Control: private, no-cache="set-cookie"'); header('Cache-Control: private, no-cache="set-cookie"');
header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT'); header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
header('Pragma: no-cache');
return; return;
} }