[ticket/13044] move GMT string out of gmdate()

senky · senky · commit 7cbd9e952472 · 2014-09-17T11:15:24.000+02:00
PHPBB3-13044
diff --git a/phpBB/feed.php b/phpBB/feed.php
@@ -164,7 +164,7 @@
 {
 	header('Content-type: text/html; charset=UTF-8');
 	header('Cache-Control: private, no-cache="set-cookie"');
-	header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
+	header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 	header('Pragma: no-cache');
 
 	$mtime = explode(' ', microtime());
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
@@ -5062,7 +5062,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
 		// application/xhtml+xml not used because of IE
 		'Content-type' => 'text/html; charset=UTF-8',
 		'Cache-Control' => 'private, no-cache="set-cookie"',
-		'Expires' => gmdate('D, d M Y H:i:s \G\M\T', time()),
+		'Expires' => gmdate('D, d M Y H:i:s', time() . ' GMT'),
 		'Pragma' => 'no-cache',
 	);
 	if (!empty($user->data['is_bot']))
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
@@ -112,7 +112,7 @@ function adm_page_header($page_title)
 		// application/xhtml+xml not used because of IE
 		'Content-type' => 'text/html; charset=UTF-8',
 		'Cache-Control' => 'private, no-cache="set-cookie"',
-		'Expires' => gmdate('D, d M Y H:i:s \G\M\T', time()),
+		'Expires' => gmdate('D, d M Y H:i:s', time() . ' GMT'),
 		'Pragma' => 'no-cache',
 	);
 
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
@@ -56,7 +56,7 @@ function send_avatar_to_browser($file, $browser)
 
 			if (strpos(strtolower($browser), 'msie 6.0') !== false)
 			{
-				header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
+				header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 			}
 			else
 			{
@@ -197,7 +197,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)
 			header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename'])));
 			if (empty($user->browser) || (strpos(strtolower($user->browser), 'msie 6.0') !== false))
 			{
-				header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
+				header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 			}
 		}
 		else
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
@@ -445,7 +445,7 @@ function page_header()
 
 		header('Content-type: text/html; charset=UTF-8');
 		header('Cache-Control: private, no-cache="set-cookie"');
-		header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));
+		header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
 		header('Pragma: no-cache');
 
 		return;

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@`
`164`	`164`	`{`
`165`	`165`	`header('Content-type: text/html; charset=UTF-8');`
`166`	`166`	`header('Cache-Control: private, no-cache="set-cookie"');`
`167`		`- header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));`
	`167`	`+ header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');`
`168`	`168`	`header('Pragma: no-cache');`
`169`	`169`
`170`	`170`	`$mtime = explode(' ', microtime());`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function send_avatar_to_browser($file, $browser)`
`56`	`56`
`57`	`57`	`if (strpos(strtolower($browser), 'msie 6.0') !== false)`
`58`	`58`	`{`
`59`		`- header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));`
	`59`	`+ header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');`
`60`	`60`	`}`
`61`	`61`	`else`
`62`	`62`	`{`
`@@ -197,7 +197,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)`
`197`	`197`	`header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename'])));`
`198`	`198`	`if (empty($user->browser) \|\| (strpos(strtolower($user->browser), 'msie 6.0') !== false))`
`199`	`199`	`{`
`200`		`- header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time()));`
	`200`	`+ header('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`	`else`