From 056651c3f0d8ffeabc12b0c0314437ae2a9e3e45 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 8 Dec 2011 04:58:26 +0000 Subject: [PATCH] FU r105512: just always use thumb.php style errors --- thumb.php | 4 ++-- thumb_handler.php | 41 +++-------------------------------------- 2 files changed, 5 insertions(+), 40 deletions(-) diff --git a/thumb.php b/thumb.php index e16d95b4ce..f9b58b92bf 100644 --- a/thumb.php +++ b/thumb.php @@ -8,9 +8,9 @@ */ define( 'MW_NO_OUTPUT_COMPRESSION', 1 ); if ( isset( $_SERVER['MW_COMPILED'] ) ) { - require ( 'phase3/includes/WebStart.php' ); + require( 'phase3/includes/WebStart.php' ); } else { - require ( dirname( __FILE__ ) . '/includes/WebStart.php' ); + require( dirname( __FILE__ ) . '/includes/WebStart.php' ); } // Don't use fancy mime detection, just check the file extension for jpg/gif/png diff --git a/thumb_handler.php b/thumb_handler.php index 39a3e7c057..35a855f87f 100644 --- a/thumb_handler.php +++ b/thumb_handler.php @@ -3,41 +3,6 @@ # Valid web server entry point define( 'THUMB_HANDLER', true ); -if ( $_SERVER['REQUEST_URI'] === $_SERVER['SCRIPT_NAME'] ) { - # Directly requesting this script is not a use case. - # Instead of giving a thumbnail error, give a generic 404. - wfDisplay404Error(); // go away, nothing to see here -} else { - # Execute thumb.php, having set THUMB_HANDLER so that - # it knows to extract params from a thumbnail file URL. - require( dirname( __FILE__ ) . '/thumb.php' ); -} - -/** - * Print out a generic 404 error message - * - * @return void - */ -function wfDisplay404Error() { - header( 'HTTP/1.1 404 Not Found' ); - header( 'Content-Type: text/html;charset=utf-8' ); - - $prot = isset( $_SERVER['HTTPS'] ) ? "https://" : "http://"; - $serv = strlen( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']; - $loc = $_SERVER["REQUEST_URI"]; - - $encUrl = htmlspecialchars( $prot . $serv . $loc ); - - // Looks like a typical apache2 error - $standard_404 = << - -404 Not Found - -

Not Found

-

The requested URL $encUrl was not found on this server.

- -ENDTEXT; - - print $standard_404; -} +# Execute thumb.php, having set THUMB_HANDLER so that +# it knows to extract params from a thumbnail file URL. +require( dirname( __FILE__ ) . '/thumb.php' ); -- 2.20.1