Merge "ApiBase::PARAM_DFLT => null is the default anyway"

diff --combined includes/api/ApiQueryRevisionsBase.php
index 609efb0,2bc6570..ebc5c2e
--- 1/includes/api/ApiQueryRevisionsBase.php
--- 2/includes/api/ApiQueryRevisionsBase.php
+++ b/includes/api/ApiQueryRevisionsBase.php
@@@ -31,8 -31,8 +31,8 @@@
   */
  abstract class ApiQueryRevisionsBase extends ApiQueryGeneratorBase {
  
 -      protected $limit, $diffto, $difftotext, $expandTemplates, $generateXML, $section,
 -              $parseContent, $fetchContent, $contentFormat, $setParsedLimit = true;
 +      protected $limit, $diffto, $difftotext, $difftotextpst, $expandTemplates, $generateXML,
 +              $section, $parseContent, $fetchContent, $contentFormat, $setParsedLimit = true;
  
        protected $fld_ids = false, $fld_flags = false, $fld_timestamp = false,
                $fld_size = false, $fld_sha1 = false, $fld_comment = false,
@@@ -61,7 -61,6 +61,7 @@@
        protected function parseParameters( $params ) {
                if ( !is_null( $params['difftotext'] ) ) {
                        $this->difftotext = $params['difftotext'];
 +                      $this->difftotextpst = $params['difftotextpst'];
                } elseif ( !is_null( $params['diffto'] ) ) {
                        if ( $params['diffto'] == 'cur' ) {
                                $params['diffto'] = 0;
@@@ -386,11 -385,6 +386,11 @@@
                                                        $this->contentFormat
                                                );
  
 +                                              if ( $this->difftotextpst ) {
 +                                                      $popts = ParserOptions::newFromContext( $this->getContext() );
 +                                                      $difftocontent = $difftocontent->preSaveTransform( $title, $user, $popts );
 +                                              }
 +
                                                $engine = $handler->createDifferenceEngine( $context );
                                                $engine->setContent( $content, $difftocontent );
                                        }
@@@ -485,24 -479,16 +485,20 @@@
                                ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-parse',
                        ),
                        'section' => array(
-                               ApiBase::PARAM_DFLT => null,
                                ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-section',
                        ),
                        'diffto' => array(
-                               ApiBase::PARAM_DFLT => null,
                                ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-diffto',
                        ),
                        'difftotext' => array(
-                               ApiBase::PARAM_DFLT => null,
                                ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-difftotext',
                        ),
 +                      'difftotextpst' => array(
 +                              ApiBase::PARAM_DFLT => false,
 +                              ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-difftotextpst',
 +                      ),
                        'contentformat' => array(
                                ApiBase::PARAM_TYPE => ContentHandler::getAllContentFormats(),
-                               ApiBase::PARAM_DFLT => null,
                                ApiBase::PARAM_HELP_MSG => 'apihelp-query+revisions+base-param-contentformat',
                        ),
                );

diff --combined includes/api/ApiQuerySearch.php
index 32607a5,53939d8..637fc4c
--- 1/includes/api/ApiQuerySearch.php
--- 2/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@@ -278,12 -278,6 +278,12 @@@ class ApiQuerySearch extends ApiQueryGe
                                ), 'p' );
                        }
                } else {
 +                      $resultPageSet->setRedirectMergePolicy( function ( $current, $new ) {
 +                              if ( !isset( $current['index'] ) || $new['index'] < $current['index'] ) {
 +                                      $current['index'] = $new['index'];
 +                              }
 +                              return $current;
 +                      } );
                        $resultPageSet->populateFromTitles( $titles );
                        $offset = $params['offset'] + 1;
                        foreach ( $titles as $index => $title ) {
@@@ -308,7 -302,6 +308,6 @@@
                                ApiBase::PARAM_ISMULTI => true,
                        ),
                        'what' => array(
-                               ApiBase::PARAM_DFLT => null,
                                ApiBase::PARAM_TYPE => array(
                                        'title',
                                        'text',

diff --combined includes/api/ApiUpload.php
index 320649f,5ba7d25..5e13e98
--- 1/includes/api/ApiUpload.php
--- 2/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@@ -82,7 -82,7 +82,7 @@@ class ApiUpload extends ApiBase 
  
                // Check if the uploaded file is sane
                if ( $this->mParams['chunk'] ) {
 -                      $maxSize = $this->mUpload->getMaxUploadSize();
 +                      $maxSize = UploadBase::getMaxUploadSize();
                        if ( $this->mParams['filesize'] > $maxSize ) {
                                $this->dieUsage( 'The file you submitted was too large', 'file-too-large' );
                        }
@@@ -139,12 -139,6 +139,12 @@@
                        return $this->getStashResult( $warnings );
                }
  
 +              // Check throttle after we've handled warnings
 +              if ( UploadBase::isThrottled( $this->getUser() )
 +              ) {
 +                      $this->dieUsageMsg( 'actionthrottledtext' );
 +              }
 +
                // This is the most common case -- a normal upload with no warnings
                // performUpload will return a formatted properly for the API with status
                return $this->performUpload( $warnings );
@@@ -204,30 -198,13 +204,30 @@@
        private function getChunkResult( $warnings ) {
                $result = array();
  
 -              $result['result'] = 'Continue';
                if ( $warnings && count( $warnings ) > 0 ) {
                        $result['warnings'] = $warnings;
                }
 +
                $request = $this->getMain()->getRequest();
                $chunkPath = $request->getFileTempname( 'chunk' );
                $chunkSize = $request->getUpload( 'chunk' )->getSize();
 +              $totalSoFar = $this->mParams['offset'] + $chunkSize;
 +              $minChunkSize = $this->getConfig()->get( 'MinUploadChunkSize' );
 +
 +              // Sanity check sizing
 +              if ( $totalSoFar > $this->mParams['filesize'] ) {
 +                      $this->dieUsage(
 +                              'Offset plus current chunk is greater than claimed file size', 'invalid-chunk'
 +                      );
 +              }
 +
 +              // Enforce minimum chunk size
 +              if ( $totalSoFar != $this->mParams['filesize'] && $chunkSize < $minChunkSize ) {
 +                      $this->dieUsage(
 +                              "Minimum chunk size is $minChunkSize bytes for non-final chunks", 'chunk-too-small'
 +                      );
 +              }
 +
                if ( $this->mParams['offset'] == 0 ) {
                        try {
                                $filekey = $this->performStash();
@@@ -239,18 -216,6 +239,18 @@@
                        }
                } else {
                        $filekey = $this->mParams['filekey'];
 +
 +                      // Don't allow further uploads to an already-completed session
 +                      $progress = UploadBase::getSessionStatus( $this->getUser(), $filekey );
 +                      if ( !$progress ) {
 +                              // Probably can't get here, but check anyway just in case
 +                              $this->dieUsage( 'No chunked upload session with this key', 'stashfailed' );
 +                      } elseif ( $progress['result'] !== 'Continue' || $progress['stage'] !== 'uploading' ) {
 +                              $this->dieUsage(
 +                                      'Chunked upload is already completed, check status for details', 'stashfailed'
 +                              );
 +                      }
 +
                        $status = $this->mUpload->addChunk(
                                $chunkPath, $chunkSize, $this->mParams['offset'] );
                        if ( !$status->isGood() ) {
@@@ -259,12 -224,18 +259,12 @@@
                                );
  
                                $this->dieUsage( $status->getWikiText(), 'stashfailed', 0, $extradata );
 -
 -                              return array();
                        }
                }
  
                // Check we added the last chunk:
 -              if ( $this->mParams['offset'] + $chunkSize == $this->mParams['filesize'] ) {
 +              if ( $totalSoFar == $this->mParams['filesize'] ) {
                        if ( $this->mParams['async'] ) {
 -                              $progress = UploadBase::getSessionStatus( $this->getUser(), $filekey );
 -                              if ( $progress && $progress['result'] === 'Poll' ) {
 -                                      $this->dieUsage( "Chunk assembly already in progress.", 'stashfailed' );
 -                              }
                                UploadBase::setSessionStatus(
                                        $this->getUser(),
                                        $filekey,
@@@ -284,38 -255,21 +284,38 @@@
                        } else {
                                $status = $this->mUpload->concatenateChunks();
                                if ( !$status->isGood() ) {
 +                                      UploadBase::setSessionStatus(
 +                                              $this->getUser(),
 +                                              $filekey,
 +                                              array( 'result' => 'Failure', 'stage' => 'assembling', 'status' => $status )
 +                                      );
                                        $this->dieUsage( $status->getWikiText(), 'stashfailed' );
 -
 -                                      return array();
                                }
  
                                // The fully concatenated file has a new filekey. So remove
                                // the old filekey and fetch the new one.
 +                              UploadBase::setSessionStatus( $this->getUser(), $filekey, false );
                                $this->mUpload->stash->removeFile( $filekey );
                                $filekey = $this->mUpload->getLocalFile()->getFileKey();
  
                                $result['result'] = 'Success';
                        }
 +              } else {
 +                      UploadBase::setSessionStatus(
 +                              $this->getUser(),
 +                              $filekey,
 +                              array(
 +                                      'result' => 'Continue',
 +                                      'stage' => 'uploading',
 +                                      'offset' => $totalSoFar,
 +                                      'status' => Status::newGood(),
 +                              )
 +                      );
 +                      $result['result'] = 'Continue';
 +                      $result['offset'] = $totalSoFar;
                }
 +
                $result['filekey'] = $filekey;
 -              $result['offset'] = $this->mParams['offset'] + $chunkSize;
  
                return $result;
        }
@@@ -425,10 -379,6 +425,10 @@@
                        // Chunk upload
                        $this->mUpload = new UploadFromChunks();
                        if ( isset( $this->mParams['filekey'] ) ) {
 +                              if ( $this->mParams['offset'] === 0 ) {
 +                                      $this->dieUsage( 'Cannot supply a filekey when offset is 0', 'badparams' );
 +                              }
 +
                                // handle new chunk
                                $this->mUpload->continueChunks(
                                        $this->mParams['filename'],
@@@ -436,10 -386,6 +436,10 @@@
                                        $request->getUpload( 'chunk' )
                                );
                        } else {
 +                              if ( $this->mParams['offset'] !== 0 ) {
 +                                      $this->dieUsage( 'Must supply a filekey when offset is non-zero', 'badparams' );
 +                              }
 +
                                // handle first chunk
                                $this->mUpload->initialize(
                                        $this->mParams['filename'],
@@@ -836,20 -782,12 +836,19 @@@
                        'url' => null,
                        'filekey' => null,
                        'sessionkey' => array(
-                               ApiBase::PARAM_DFLT => null,
                                ApiBase::PARAM_DEPRECATED => true,
                        ),
                        'stash' => false,
  
 -                      'filesize' => null,
 -                      'offset' => null,
 +                      'filesize' => array(
 +                              ApiBase::PARAM_TYPE => 'integer',
 +                              ApiBase::PARAM_MIN => 0,
 +                              ApiBase::PARAM_MAX => UploadBase::getMaxUploadSize(),
 +                      ),
 +                      'offset' => array(
 +                              ApiBase::PARAM_TYPE => 'integer',
 +                              ApiBase::PARAM_MIN => 0,
 +                      ),
                        'chunk' => array(
                                ApiBase::PARAM_TYPE => 'upload',
                        ),