X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/blobdiff_plain/16113435087c844fba212c9c47187ceaf54ce086..4c519d745ef0d551d64afd68e5d8b894b330e114:/_.htaccess?ds=sidebyside

diff --git a/_.htaccess b/_.htaccess
index 3051d92a003..c3efd3e9310 100644
--- a/_.htaccess
+++ b/_.htaccess
@@ -1,35 +1,35 @@
 #####
-# 
+#
 # Example .htaccess file for TYPO3 CMS - for use with Apache Webserver
-# 
+#
 # This file includes settings for the following configuration options:
-# 
+#
 # - Compression via TYPO3
 # - Settings for mod_rewrite (URL-Rewriting)
 # - PHP optimisation
 # - Miscellaneous
-# 
+#
 # If you want to use it, you have to copy it to the root folder of your TYPO3 installation (if its
 # not there already) and rename it to '.htaccess'. To make .htaccess files work, you might need to
 # adjust the 'AllowOverride' directive in your Apache configuration file.
-# 
+#
 # IMPORTANT: You may need to change this file depending on your TYPO3 installation!
 #
 # Lines starting with a # are treated as comment and ignored by the web server.
-# 
+#
 # You should change every occurance of TYPO3root/ to the location where you have your website in.
 # For example:
 # If you have your website located at http://mysite.com/
 # then your TYPO3root/ is just empty (remove 'TYPO3root/')
 # If you have your website located at http://mysite.com/some/path/
 # then your TYPO3root/ is some/path/ (search and replace)
-# 
+#
 # You can also use this configuration in your httpd.conf, but then you have to modify some lines,
 # see the comments (search for 'httpd.conf')
-# 
+#
 # Questions about this file go to the matching Install mailing list, see
 # http://typo3.org/documentation/mailing-lists/
-# 
+#
 ####
 
 
@@ -37,8 +37,10 @@
 
 # Compressing resource files will save bandwidth and so improve loading speed especially for users
 # with slower internet connections. TYPO3 can compress the .js and .css files for you.
-# 1) Uncomment the following lines and
-# 2) Set $TYPO3_CONF_VARS['BE']['compressionLevel'] = '9'
+# *) Uncomment the following lines and
+# *) Set $TYPO3_CONF_VARS['BE']['compressionLevel'] = '9' for the Backend
+# *) Set $TYPO3_CONF_VARS['FE']['compressionLevel'] = '9' together with the TypoScript properties
+#    config.compressJs and config.compressCss for GZIP compression of Frontend JS and CSS files.
 
 #<FilesMatch "\.js\.gzip$">
 #	AddType "text/javascript" .gzip
@@ -51,9 +53,27 @@
 ### End: Compression via TYPO3 ###
 
 
+### Begin: Browser caching of ressource files ###
+
+# Enable long browser caching for JavaScript and CSS files.
+
+# This affects Frontend and Backend and increases performance.
+# You can also add other file extensions (like gif, png, jpg), if you want them to be longer cached, too.
+
+<FilesMatch "\.(js|css)$">
+  <IfModule mod_expires.c>
+    ExpiresActive on
+    ExpiresDefault "access plus 7 days"
+  </IfModule>
+  FileETag MTime Size
+</FilesMatch>
+
+### End: Browser caching of ressource files ###
+
+
 ### Begin: Settings for mod_rewrite ###
 
-# You need rewriting, if you use a URL-Rewriting extension (RealURL, CoolUri, SimulateStatic).
+# You need rewriting, if you use a URL-Rewriting extension (RealURL, CoolUri).
 
 <IfModule mod_rewrite.c>
 
@@ -71,6 +91,18 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule ^(.+)\.(\d+)\.(php|js|css|png|jpg|gif|gzip)$ $1.$3 [L]
 
+# Basic security checks
+# - Restrict access to deleted files in Recycler directories
+# - Restrict access to TypoScript files in default templates directories
+# - Restrict access to Private extension directories
+# For httpd.conf, use these lines instead of the next ones:
+# RewriteRule ^/TYPO3root/fileadmin/(.*/)?_recycler_/ - [F]
+# RewriteRule ^/TYPO3root/fileadmin/templates/.*(\.txt|\.ts)$ - [F]
+# RewriteRule ^/TYPO3root/typo3conf/ext/[^/]+/Resources/Private/ - [F]
+RewriteRule ^fileadmin/(.*/)?_recycler_/ - [F]
+RewriteRule ^fileadmin/templates/.*(\.txt|\.ts)$ - [F]
+RewriteRule ^typo3conf/ext/[^/]+/Resources/Private/ - [F]
+
 # Stop rewrite processing, if we are in the typo3/ directory.
 # For httpd.conf, use this line instead of the next one:
 # RewriteRule ^/TYPO3root/(typo3/|t3lib/|fileadmin/|typo3conf/|typo3temp/|uploads/|favicon\.ico) - [L]