[Mantisbt-cvs] mantisbt core.php,1.38,1.39 file_download.php,1.33,1.34 meta_inc.php,1.16,1.17

[Glenn H. <thr...@us...>]

Update of /cvsroot/mantisbt/mantisbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27176

Modified Files:
	core.php file_download.php meta_inc.php 
Log Message:
fix "Expires" headers to be compliant with RFC 1945


Index: file_download.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/file_download.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- file_download.php	27 Mar 2005 19:26:27 -0000	1.33
+++ file_download.php	31 Mar 2005 01:08:37 -0000	1.34
@@ -87,7 +87,7 @@
 	} else {
 		header( 'Pragma: no-cache' );
 	}
-	header( 'Expires: 0' );
+	header( 'Expires: ' . gmdate( 'D, d M Y H:i:s \G\M\T', time() ) );
 
 	# dump file content to the connection.
 	switch ( config_get( 'file_upload_method' ) ) {

Index: core.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- core.php	20 Feb 2005 21:12:07 -0000	1.38
+++ core.php	31 Mar 2005 01:08:36 -0000	1.39
@@ -100,7 +100,7 @@
 	global $g_bypass_headers;
 	if ( !isset( $g_bypass_headers ) && !headers_sent() ) {
 		header( 'Pragma: no-cache' );
-		header( 'Expires: Fri, 01 Jan 1999 00:00:00 GMT' );
+		header( 'Expires: ' . gmdate( 'D, d M Y H:i:s \G\M\T', time() ) );
 		header( 'Cache-Control: no-store, no-cache, must-revalidate' );
 		header( 'Cache-Control: post-check=0, pre-check=0', false );
 

Index: meta_inc.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/meta_inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- meta_inc.php	16 May 2004 12:22:06 -0000	1.16
+++ meta_inc.php	31 Mar 2005 01:08:37 -0000	1.17
@@ -9,11 +9,9 @@
 	# $Id$
 	# --------------------------------------------------------
 
-	# prevent caching
-	$t_content_expire = config_get('content_expire');
 ?>
 	<meta http-equiv="Pragma" content="no-cache" />
 	<meta http-equiv="Cache-Control" content="no-cache" />
 	<meta http-equiv="Pragma-directive" content="no-cache" />
 	<meta http-equiv="Cache-Directive" content="no-cache" />
-	<meta http-equiv="Expires" content="<?php echo $t_content_expire ?>" />
+	<meta http-equiv="Expires" content="<?php echo gmdate( 'D, d M Y H:i:s \G\M\T', time() ) ?>" />