diff options
authorDavid Rothstein2015-10-12 21:53:46 (GMT)
committerDavid Rothstein2015-10-12 21:53:46 (GMT)
commit6e6c3dba67cda8b218befae00422d361b3990942 (patch)
parent00206a4d7f87981b3b1212942ce65f371c0cb3ae (diff)
Issue #2455057 by michaellenahan, jhodgdon, jelo: Fix fast 404 settings for private image files
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ec87eb0..51bd4ac 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
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
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 562f998..214e939 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -494,6 +494,7 @@ ini_set('session.cookie_lifetime', 2000000);
* 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 @@ ini_set('session.cookie_lifetime', 2000000);
* 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" ""><html xmlns=""><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>';