Index: .htaccess =================================================================== RCS file: /cvs/drupal/drupal/.htaccess,v retrieving revision 1.108 diff -u -p -r1.108 .htaccess --- .htaccess 11 Apr 2010 18:33:43 -0000 1.108 +++ .htaccess 12 Apr 2010 17:54:09 -0000 @@ -16,12 +16,6 @@ Options +FollowSymLinks # Make Drupal handle any 404 errors. ErrorDocument 404 /index.php -# Force simple error message for requests for non-existent favicon.ico. - - # There is no end quote below, for compatibility with Apache 1.3. - ErrorDocument 404 "The requested file favicon.ico was not found. - - # Set the default handler. DirectoryIndex index.php index.html index.htm Index: includes/bootstrap.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v retrieving revision 1.373 diff -u -p -r1.373 bootstrap.inc --- includes/bootstrap.inc 11 Apr 2010 21:05:13 -0000 1.373 +++ includes/bootstrap.inc 12 Apr 2010 17:54:10 -0000 @@ -2065,6 +2065,26 @@ function drupal_maintenance_theme() { } /** + * Returns a simple 404 Not Found page. + * + * If fast 404 pages are enabled, and this is a matching page then print a + * simple 404 page and exit. + * + * This function is called from drupal_deliver_html_page() at the time when a + * a normal 404 page is generated, but it can also optionally be called directly + * from settings.php to prevent a Drupal bootstrap on these pages. See + * documentation in settings.php for the benefits and drawbacks of using this. + */ +function drupal_fast_404() { + $fast_paths = variable_get('404_fast_paths', FALSE); + if ($fast_paths && preg_match($fast_paths, $_GET['q'])) { + drupal_add_http_header('Status', '404 Not Found'); + print variable_get('404_fast_html', '404 Not Found

Not Found

The requested URL /' . $_GET['q'] . ' was not found on this server.

'); + exit; + } +} + +/** * Return TRUE if a Drupal installation is currently being attempted. */ function drupal_installation_attempted() { Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.1146 diff -u -p -r1.1146 common.inc --- includes/common.inc 11 Apr 2010 18:33:43 -0000 1.1146 +++ includes/common.inc 12 Apr 2010 17:54:10 -0000 @@ -2323,11 +2323,14 @@ function drupal_deliver_html_page($page_ // @todo: Break these up into separate functions? switch ($page_callback_result) { case MENU_NOT_FOUND: + watchdog('page not found', check_plain($_GET['q']), NULL, WATCHDOG_WARNING); + + // Check for and return a fast 404 page if configured. + drupal_fast_404(); + // Print a 404 page. drupal_add_http_header('Status', '404 Not Found'); - watchdog('page not found', check_plain($_GET['q']), NULL, WATCHDOG_WARNING); - // Keep old path for reference, and to allow forms to redirect to it. if (!isset($_GET['destination'])) { $_GET['destination'] = $_GET['q']; Index: sites/default/default.settings.php =================================================================== RCS file: /cvs/drupal/drupal/sites/default/default.settings.php,v retrieving revision 1.44 diff -u -p -r1.44 default.settings.php --- sites/default/default.settings.php 7 Apr 2010 15:07:59 -0000 1.44 +++ sites/default/default.settings.php 12 Apr 2010 17:54:10 -0000 @@ -393,6 +393,38 @@ ini_set('session.cookie_lifetime', 20000 # ); /** + * 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: 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'] = '/.(txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'; +$conf['404_fast_html'] = '404 Not Found

Not Found

The requested URL /' . $_GET['q'] . ' 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 signs below. + */ +# drupal_fast_404(); + +/** * Authorized file system operations: * * The Update manager module included with Drupal provides a mechanism for