Issue #2455057 by michaellenahan, jhodgdon, jelo: Fix fast 404 settings for private image files

6e6c3dba · David Rothstein · 00206a4d · 6e6c3dba · 6e6c3dba
Commit 6e6c3dba authored 9 years ago by David Rothstein
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt

 Drupal 7.40, xxxx-xx-xx (development version)
 -----------------------
+- Changed the default settings.php configuration to exclude private files from
+  the "404_fast_paths" behavior.
 - Changed the page that displays filter tips for a particular text format, for
  example filter/tips/full_html, to return "page not found" or "access denied"
  if the format does not exist or the user does not have access to it. This

--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -494,6 +494,7 @@
 * specific pattern:
 * - 404_fast_paths_exclude: A regular expression to match paths to exclude,
 *   such as images generated by image styles, or dynamically-resized images.
+ *   The default pattern provided below also excludes the private file system.
 *   If you need to add more paths, you can add '|path' to the expression.
 * - 404_fast_paths: A regular expression to match paths that should return a
 *   simple 404 page, rather than the fully themed 404 page. If you don't have
@@ -502,7 +503,7 @@
 *
 * Add leading hash signs if you would like to disable this functionality.
 */
-$conf['404_fast_paths_exclude'] = '/\/(?:styles)\//';
+$conf['404_fast_paths_exclude'] = '/\/(?:styles)|(?:system\/files)\//';
 $conf['404_fast_paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';
 $conf['404_fast_html'] = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>';