Version 4.2.0

system/File/Amazon.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		File Handler: Amazon S3
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @since		12 Jul 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\File;
@@ -520,14 +519,7 @@ class _Amazon extends \IPS\File
 		{
 			$headers['Content-Length']	= \strlen( $content );
 
-			$cacheSeconds = 3600;
-			$ext = mb_substr( $mimeUri, ( mb_strrpos( $mimeUri, '.' ) + 1 ) );
-			
-			if ( preg_match( "/\." . preg_quote( $ext, '/' ) . "\.([a-zA-Z0-9]{32})\." . preg_quote( $ext, '/' ) . "$/", $mimeUri ) )
-			{
-				/* This is an obfuscated file, so it will change each time the file is updated so it is safe to cache for longer */
-				$cacheSeconds = 3600 * 24 * 365;
-			}
+			$cacheSeconds = 3600 * 24 * 365;
 
 			/* Custom Cache-Control */
 			if( $storageExtension !== NULL AND mb_strpos( $storageExtension, '_' ) !== FALSE )
@@ -541,8 +533,7 @@ class _Amazon extends \IPS\File
 				}
 			}
 			
-			$headers['Cache-Control'] = 'max-age=' . $cacheSeconds;
-			$headers['Expires'] = date( 'r', time() + $cacheSeconds );
+			$headers['Cache-Control'] = 'public, max-age=' . $cacheSeconds;
 		}
 		
 		/* We need to strip query string parameters for the signature, but not always (e.g. a subresource such as ?acl needs to be included and multi-