Ticket #3426: 3426.5.diff

wp-includes/load.php

@@ -105 +105 @@
 }
 
 /**
+ * Check if a favicon.ico request made it to us, if it did return
+ * headers for 0 length image/vnd.microsoft.icon
+ *
+ * If the request for a favicon.ico made it this far lets toss out a 0 length
+ * header to short circuit the request from returning a 404.
+ *
+ * @since 3.0
+ */
+function wp_favicon() {
+        if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) { 
+                header('Content-Type: image/vnd.microsoft.icon');
+                header('Content-Length: 0'); 
+                exit;
+        }
+}
+
+/**
  * Dies with a maintenance message when conditions are met.
  *
  * Checks for a file in the WordPress root directory named ".maintenance".
@@ -544 +561 @@
         return false;
 }
 
-?>
- No newline at end of file
+?>

wp-settings.php

@@ -43 +43 @@
 // Check for the required PHP version and for the MySQL extension or a database drop-in.
 wp_check_php_mysql_versions();
 
+// Check if we have recieved a request due to missing favicon.ico
+wp_favicon();
+
 // Check if we're in maintenance mode.
 wp_maintenance();