The requested URL "@path" was not found on this server.
'); + // Replace @path in the variable with the page path. + print strtr($fast_404_html, array('@path' => check_plain(request_uri()))); + exit; + } + } +} + /** * Return TRUE if a Drupal installation is currently being attempted. */ diff --git a/includes/common.inc b/includes/common.inc index 72fcf76a8046a891f7874db900efc6a8ed2516fe..6db2e64cad597d327e3d826d31f30b8ea9f3a5f9 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -2476,6 +2476,9 @@ function drupal_deliver_html_page($page_callback_result) { watchdog('page not found', check_plain($_GET['q']), NULL, WATCHDOG_WARNING); + // Check for and return a fast 404 page if configured. + drupal_fast_404(); + // Keep old path for reference, and to allow forms to redirect to it. if (!isset($_GET['destination'])) { $_GET['destination'] = $_GET['q']; @@ -2492,7 +2495,7 @@ function drupal_deliver_html_page($page_callback_result) { if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) { // Standard 404 handler. drupal_set_title(t('Page not found')); - $return = t('The requested page could not be found.'); + $return = t('The requested page "@path" could not be found.', array('@path' => request_uri())); } drupal_set_page_content($return); diff --git a/modules/locale/locale.test b/modules/locale/locale.test index 425f68cfa79abc86a482483550f5f57a639b1c6c..90e313df74095d2df9315656cc210bd1959db42e 100644 --- a/modules/locale/locale.test +++ b/modules/locale/locale.test @@ -290,9 +290,8 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase { $this->assertRaw(t('The language %locale has been removed.', array('%locale' => $name)), t('The test language has been removed.')); // Reload to remove $name. $this->drupalGet($path); - $this->assertNoText($langcode, t('Language code not found.')); - $this->assertNoText($name, t('Name not found.')); - $this->assertNoText($native, t('Native not found.')); + // Verify that language is no longer found. + $this->assertResponse(404, t('Language no longer found.')); $this->drupalLogout(); // Delete the string. diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index 0472f02b1c3bdf1344cf9ddad90e302d799083c4..710cab3589d8bad13ffc30838a8c4b36be11595e 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -427,6 +427,42 @@ # 'a.b.c.d', # ); +/** + * Fast 404 pages: + * + * Drupal can generate fully themed 404 pages. However, some of these responses + * are for images or other resource files that are not displayed to the user. + * This can waste bandwidth, and also generate server load. + * + * The options below return a simple, fast 404 page for URLs matching a + * 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. + * 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 + * any aliases ending in htm or html you can add '|s?html?' to the expression. + * - 404_fast_html: The html to return for simple 404 pages. + * + * Add leading hash signs if you would like to disable this functionality. + */ +$conf['404_fast_paths_exclude'] = '/\/(?:styles)\//'; +$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'] = 'The requested URL "@path" was not found on this server.
'; + +/** + * By default, fast 404s are returned as part of the normal page request + * process, which will properly serve valid pages that happen to match and will + * also log actual 404s to the Drupal log. Alternatively you can choose to + * return a 404 now by uncommenting the following line. This will reduce server + * load, but will cause even valid pages that happen to match the pattern to + * return 404s, rather than the actual page. It will also prevent the Drupal + * system log entry. Ensure you understand the effects of this before enabling. + * + * To enable this functionality, remove the leading hash sign below. + */ +# drupal_fast_404(); + /** * Authorized file system operations: *