Update maintenance/dev/'s router, add handling for things like /wiki/File:Foo.png...

diff --git a/maintenance/dev/router.php b/maintenance/dev/router.php
index ca5c410..0b88b39 100644 (file)
--- a/maintenance/dev/router.php
+++ b/maintenance/dev/router.php
@@ -4,56 +4,72 @@ ini_set('display_errors', 1);
 error_reporting(E_ALL);
 
 if ( isset( $_SERVER["SCRIPT_FILENAME"] ) ) {
+       # Known resource, sometimes a script sometimes a file
        $file = $_SERVER["SCRIPT_FILENAME"];
-       if ( !is_readable( $file ) ) {
-               // Let the server throw the error
-               return false;
+} elseif ( isset( $_SERVER["SCRIPT_NAME"] ) ) {
+       # Usually unknown, document root relative rather than absolute
+       # Happens with some cases like /wiki/File:Image.png
+       if ( is_readable( $_SERVER['DOCUMENT_ROOT'] . $_SERVER["SCRIPT_NAME"] ) ) {
+               # Just in case this actually IS a file, set it here
+               $file = $_SERVER['DOCUMENT_ROOT'] . $_SERVER["SCRIPT_NAME"];
+       } else {
+               # Otherwise let's pretend that this is supposed to go to index.php
+               $file = $_SERVER['DOCUMENT_ROOT'] . '/index.php';
        }
-       $ext = pathinfo( $file, PATHINFO_EXTENSION );
-       if ( $ext == 'php' || $ext == 'php5' ) {
-               # Execute php files
-               # We use require and return true here because when you return false
-               # the php webserver will discard post data and things like login
-               # will not function in the dev environment.
-               require $file;
-               return true;
+} else {
+       # Meh, we'll just give up
+       return false;
+}
+
+# And now do handling for that $file
+
+if ( !is_readable( $file ) ) {
+       # Let the server throw the error if it doesn't exist
+       return false;
+}
+$ext = pathinfo( $file, PATHINFO_EXTENSION );
+if ( $ext == 'php' || $ext == 'php5' ) {
+       # Execute php files
+       # We use require and return true here because when you return false
+       # the php webserver will discard post data and things like login
+       # will not function in the dev environment.
+       require( $file );
+       return true;
+}
+$mime = false;
+$lines = explode( "\n", file_get_contents( "includes/mime.types" ) );
+foreach ( $lines as $line ) {
+       $exts = explode( " ", $line );
+       $mime = array_shift( $exts );
+       if ( in_array( $ext, $exts ) ) {
+               break; # this is the right value for $mime
        }
        $mime = false;
-       $lines = explode( "\n", file_get_contents( "includes/mime.types" ) );
-       foreach ( $lines as $line ) {
-               $exts = explode( " ", $line );
-               $mime = array_shift( $exts );
-               if ( in_array( $ext, $exts ) ) {
-                       break; # this is the right value for $mime
-               }
-               $mime = false;
-       }
-       if ( !$mime ) {
-               $basename = basename( $file );
-               if ( $basename == strtoupper( $basename ) ) {
-                       # IF it's something like README serve it as text
-                       $mime = "text/plain";
-               }
+}
+if ( !$mime ) {
+       $basename = basename( $file );
+       if ( $basename == strtoupper( $basename ) ) {
+               # IF it's something like README serve it as text
+               $mime = "text/plain";
        }
-       if ( $mime ) {
-               # Use custom handling to serve files with a known mime type
-               # This way we can serve things like .svg files that the built-in
-               # PHP webserver doesn't understand.
-               # ;) Nicely enough we just happen to bundle a mime.types file
-               $f = fopen($file, 'rb');
-               if ( preg_match( '^text/', $mime ) ) {
-                       # Text should have a charset=UTF-8 (php's webserver does this too)
-                       header("Content-Type: $mime; charset=UTF-8");
-               } else {
-                       header("Content-Type: $mime");
-               }
-               header("Content-Length: " . filesize($file));
-               // Stream that out to the browser
-               fpassthru($f);
-               return true;
+}
+if ( $mime ) {
+       # Use custom handling to serve files with a known mime type
+       # This way we can serve things like .svg files that the built-in
+       # PHP webserver doesn't understand.
+       # ;) Nicely enough we just happen to bundle a mime.types file
+       $f = fopen($file, 'rb');
+       if ( preg_match( '^text/', $mime ) ) {
+               # Text should have a charset=UTF-8 (php's webserver does this too)
+               header("Content-Type: $mime; charset=UTF-8");
+       } else {
+               header("Content-Type: $mime");
        }
+       header("Content-Length: " . filesize($file));
+       // Stream that out to the browser
+       fpassthru($f);
+       return true;
 }
 
 # Let the php server handle things on it's own otherwise
 return false;
-