Merge "Add fastcgi_finish_request where appropriate"

diff --combined api.php
index 51bb2ad,5e23585..0d2312a
--- 1/api.php
--- 2/api.php
+++ b/api.php
@@@ -69,18 -69,20 +69,23 @@@ $wgTitle = Title::makeTitle( NS_MAIN, '
   */
  $processor = new ApiMain( RequestContext::getMain(), $wgEnableWriteAPI );
  
 +// Last chance hook before executing the API
 +wfRunHooks( 'ApiBeforeMain', array( &$processor ) );
 +
  // Process data & print results
  $processor->execute();
  
+ if ( function_exists( 'fastcgi_finish_request' ) ) {
+       fastcgi_finish_request();
+ }
+ 
  // Execute any deferred updates
  DeferredUpdates::doUpdates();
  
  // Log what the user did, for book-keeping purposes.
  $endtime = microtime( true );
  wfProfileOut( 'api.php' );
+ 
  wfLogProfilingData();
  
  // Log the request

diff --combined includes/Wiki.php
index 1bb9c40,c809339..fd7898f
--- 1/includes/Wiki.php
--- 2/includes/Wiki.php
+++ b/includes/Wiki.php
@@@ -95,8 -95,8 +95,8 @@@ class MediaWiki 
                        // Check variant links so that interwiki links don't have to worry
                        // about the possible different language variants
                        if ( count( $wgContLang->getVariants() ) > 1
 -                              && !is_null( $ret ) && $ret->getArticleID() == 0 )
 -                      {
 +                              && !is_null( $ret ) && $ret->getArticleID() == 0
 +                      ) {
                                $wgContLang->findVariantLink( $title, $ret );
                        }
                }
@@@ -121,7 -121,7 +121,7 @@@
                        $ret = Title::newMainPage();
                }
  
 -              if ( $ret === null || ( $ret->getDBkey() == '' && $ret->getInterwiki() == '' ) ) {
 +              if ( $ret === null || ( $ret->getDBkey() == '' && !$ret->isExternal() ) ) {
                        $ret = SpecialPage::getTitleFor( 'Badtitle' );
                }
  
@@@ -197,9 -197,9 +197,9 @@@
                wfRunHooks( 'BeforeInitialize', array( &$title, &$unused, &$output, &$user, $request, $this ) );
  
                // Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
 -              if ( is_null( $title ) || ( $title->getDBkey() == '' && $title->getInterwiki() == '' ) ||
 -                      $title->isSpecial( 'Badtitle' ) )
 -              {
 +              if ( is_null( $title ) || ( $title->getDBkey() == '' && !$title->isExternal() )
 +                      || $title->isSpecial( 'Badtitle' )
 +              ) {
                        $this->context->setTitle( SpecialPage::getTitleFor( 'Badtitle' ) );
                        wfProfileOut( __METHOD__ );
                        throw new BadTitleError();
@@@ -231,7 -231,7 +231,7 @@@
                $pageView = false; // was an article or special page viewed?
  
                // Interwiki redirects
 -              if ( $title->getInterwiki() != '' ) {
 +              if ( $title->isExternal() ) {
                        $rdfrom = $request->getVal( 'rdfrom' );
                        if ( $rdfrom ) {
                                $url = $title->getFullURL( array( 'rdfrom' => $rdfrom ) );
@@@ -242,8 -242,8 +242,8 @@@
                        }
                        // Check for a redirect loop
                        if ( !preg_match( '/^' . preg_quote( $wgServer, '/' ) . '/', $url )
 -                              && $title->isLocal() )
 -                      {
 +                              && $title->isLocal()
 +                      ) {
                                // 301 so google et al report the target as the actual url.
                                $output->redirect( $url, 301 );
                        } else {
@@@ -253,11 -253,11 +253,11 @@@
                        }
                // Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant
                } elseif ( $request->getVal( 'action', 'view' ) == 'view' && !$request->wasPosted()
 -                      && ( $request->getVal( 'title' ) === null ||
 -                              $title->getPrefixedDBkey() != $request->getVal( 'title' ) )
 +                      && ( $request->getVal( 'title' ) === null
 +                              || $title->getPrefixedDBkey() != $request->getVal( 'title' ) )
                        && !count( $request->getValueNames( array( 'action', 'title' ) ) )
 -                      && wfRunHooks( 'TestCanonicalRedirect', array( $request, $title, $output ) ) )
 -              {
 +                      && wfRunHooks( 'TestCanonicalRedirect', array( $request, $title, $output ) )
 +              ) {
                        if ( $title->isSpecialPage() ) {
                                list( $name, $subpage ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
                                if ( $name ) {
@@@ -358,12 -358,12 +358,12 @@@
                $action = $request->getVal( 'action', 'view' );
                $file = ( $title->getNamespace() == NS_FILE ) ? $article->getFile() : null;
                if ( ( $action == 'view' || $action == 'render' ) // ... for actions that show content
 -                      && !$request->getVal( 'oldid' ) && // ... and are not old revisions
 -                      !$request->getVal( 'diff' ) && // ... and not when showing diff
 -                      $request->getVal( 'redirect' ) != 'no' && // ... unless explicitly told not to
 +                      && !$request->getVal( 'oldid' ) // ... and are not old revisions
 +                      && !$request->getVal( 'diff' ) // ... and not when showing diff
 +                      && $request->getVal( 'redirect' ) != 'no' // ... unless explicitly told not to
                        // ... and the article is not a non-redirect image page with associated file
 -                      !( is_object( $file ) && $file->exists() && !$file->getRedirected() ) )
 -              {
 +                      && !( is_object( $file ) && $file->exists() && !$file->getRedirected() )
 +              ) {
                        // Give extensions a change to ignore/handle redirects as needed
                        $ignoreRedirect = $target = false;
  
@@@ -420,8 -420,8 +420,8 @@@
                $user = $this->context->getUser();
  
                if ( !wfRunHooks( 'MediaWikiPerformAction',
 -                      array( $output, $page, $title, $user, $request, $this ) ) )
 -              {
 +                              array( $output, $page, $title, $user, $request, $this ) )
 +              ) {
                        wfProfileOut( __METHOD__ );
                        return;
                }
@@@ -458,6 -458,9 +458,9 @@@
                try {
                        $this->checkMaxLag();
                        $this->main();
+                       if ( function_exists( 'fastcgi_finish_request' ) ) {
+                               fastcgi_finish_request();
+                       }
                        $this->restInPeace();
                } catch ( Exception $e ) {
                        MWExceptionHandler::handle( $e );