production.
=== Configuration changes in 1.28 ===
+* $wgSend404Code now affects status code of action=history if the page is not there.
* BREAKING CHANGE: $wgHTTPProxy is now *required* for all external requests
made by MediaWiki via a proxy. Relying on the http_proxy environment
variable is no longer supported.
==== Upgraded external libraries ====
* Updated es5-shim from v4.1.5 to v4.5.8
* Updated composer/semver from v1.4.1 to v1.4.2
+* Updated wikimedia/php-session-serializer from v1.0.3 to v1.0.4
==== New external libraries ====
* Added wikimedia/scoped-callback v1.0.0
==== Removed and replaced external libraries ====
=== Bug fixes in 1.28 ===
+* (T146496) action=history pages should return 404 HTTP error code if the page does not exist
* (T137264) SECURITY: XSS in unclosed internal links
* (T133147) SECURITY: Escape '<' and ']]>' in inline <style> blocks
* (T133147) SECURITY: Require login to preview user CSS pages
'CssContent' => __DIR__ . '/includes/content/CssContent.php',
'CssContentHandler' => __DIR__ . '/includes/content/CssContentHandler.php',
'CsvStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
- 'CurlHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
+ 'CurlHttpRequest' => __DIR__ . '/includes/http/CurlHttpRequest.php',
'DBAccessBase' => __DIR__ . '/includes/dao/DBAccessBase.php',
'DBAccessError' => __DIR__ . '/includes/libs/rdbms/exception/DBAccessError.php',
'DBAccessObjectUtils' => __DIR__ . '/includes/dao/DBAccessObjectUtils.php',
'Html' => __DIR__ . '/includes/Html.php',
'HtmlArmor' => __DIR__ . '/includes/libs/HtmlArmor.php',
'HtmlFormatter' => __DIR__ . '/includes/HtmlFormatter.php',
- 'Http' => __DIR__ . '/includes/HttpFunctions.php',
+ 'Http' => __DIR__ . '/includes/http/Http.php',
'HttpError' => __DIR__ . '/includes/exception/HttpError.php',
'HttpStatus' => __DIR__ . '/includes/libs/HttpStatus.php',
'IApiMessage' => __DIR__ . '/includes/api/ApiMessage.php',
'MWExceptionRenderer' => __DIR__ . '/includes/exception/MWExceptionRenderer.php',
'MWFileProps' => __DIR__ . '/includes/utils/MWFileProps.php',
'MWGrants' => __DIR__ . '/includes/utils/MWGrants.php',
- 'MWHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
+ 'MWHttpRequest' => __DIR__ . '/includes/http/MWHttpRequest.php',
'MWLBFactory' => __DIR__ . '/includes/db/MWLBFactory.php',
'MWMemcached' => __DIR__ . '/includes/compat/MemcachedClientCompat.php',
'MWMessagePack' => __DIR__ . '/includes/libs/MWMessagePack.php',
'Pbkdf2Password' => __DIR__ . '/includes/password/Pbkdf2Password.php',
'PerRowAugmentor' => __DIR__ . '/includes/search/PerRowAugmentor.php',
'PermissionsError' => __DIR__ . '/includes/exception/PermissionsError.php',
- 'PhpHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
+ 'PhpHttpRequest' => __DIR__ . '/includes/http/PhpHttpRequest.php',
'PhpXmlBugTester' => __DIR__ . '/includes/installer/PhpBugTests.php',
'Pingback' => __DIR__ . '/includes/Pingback.php',
'PoolCounter' => __DIR__ . '/includes/poolcounter/PoolCounter.php',
"ext-xml": "*",
"liuggio/statsd-php-client": "1.0.18",
"mediawiki/at-ease": "1.1.0",
- "oojs/oojs-ui": "0.17.9",
+ "oojs/oojs-ui": "0.17.10",
"oyejorge/less.php": "1.7.0.10",
"php": ">=5.5.9",
"psr/log": "1.0.0",
"wikimedia/composer-merge-plugin": "1.3.1",
"wikimedia/html-formatter": "1.0.1",
"wikimedia/ip-set": "1.1.0",
- "wikimedia/php-session-serializer": "1.0.3",
+ "wikimedia/php-session-serializer": "1.0.4",
"wikimedia/relpath": "1.0.3",
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
+++ /dev/null
-<?php
-/**
- * Various HTTP related functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup HTTP
- */
-
-/**
- * @defgroup HTTP HTTP
- */
-
-use MediaWiki\Logger\LoggerFactory;
-
-/**
- * Various HTTP related functions
- * @ingroup HTTP
- */
-class Http {
- static public $httpEngine = false;
-
- /**
- * Perform an HTTP request
- *
- * @param string $method HTTP method. Usually GET/POST
- * @param string $url Full URL to act on. If protocol-relative, will be expanded to an http:// URL
- * @param array $options Options to pass to MWHttpRequest object.
- * Possible keys for the array:
- * - timeout Timeout length in seconds
- * - connectTimeout Timeout for connection, in seconds (curl only)
- * - postData An array of key-value pairs or a url-encoded form data
- * - proxy The proxy to use.
- * Otherwise it will use $wgHTTPProxy (if set)
- * Otherwise it will use the environment variable "http_proxy" (if set)
- * - noProxy Don't use any proxy at all. Takes precedence over proxy value(s).
- * - sslVerifyHost Verify hostname against certificate
- * - sslVerifyCert Verify SSL certificate
- * - caInfo Provide CA information
- * - maxRedirects Maximum number of redirects to follow (defaults to 5)
- * - followRedirects Whether to follow redirects (defaults to false).
- * Note: this should only be used when the target URL is trusted,
- * to avoid attacks on intranet services accessible by HTTP.
- * - userAgent A user agent, if you want to override the default
- * MediaWiki/$wgVersion
- * @param string $caller The method making this request, for profiling
- * @return string|bool (bool)false on failure or a string on success
- */
- public static function request( $method, $url, $options = [], $caller = __METHOD__ ) {
- wfDebug( "HTTP: $method: $url\n" );
-
- $options['method'] = strtoupper( $method );
-
- if ( !isset( $options['timeout'] ) ) {
- $options['timeout'] = 'default';
- }
- if ( !isset( $options['connectTimeout'] ) ) {
- $options['connectTimeout'] = 'default';
- }
-
- $req = MWHttpRequest::factory( $url, $options, $caller );
- $status = $req->execute();
-
- if ( $status->isOK() ) {
- return $req->getContent();
- } else {
- $errors = $status->getErrorsByType( 'error' );
- $logger = LoggerFactory::getInstance( 'http' );
- $logger->warning( $status->getWikiText( false, false, 'en' ),
- [ 'error' => $errors, 'caller' => $caller, 'content' => $req->getContent() ] );
- return false;
- }
- }
-
- /**
- * Simple wrapper for Http::request( 'GET' )
- * @see Http::request()
- * @since 1.25 Second parameter $timeout removed. Second parameter
- * is now $options which can be given a 'timeout'
- *
- * @param string $url
- * @param array $options
- * @param string $caller The method making this request, for profiling
- * @return string|bool false on error
- */
- public static function get( $url, $options = [], $caller = __METHOD__ ) {
- $args = func_get_args();
- if ( isset( $args[1] ) && ( is_string( $args[1] ) || is_numeric( $args[1] ) ) ) {
- // Second was used to be the timeout
- // And third parameter used to be $options
- wfWarn( "Second parameter should not be a timeout.", 2 );
- $options = isset( $args[2] ) && is_array( $args[2] ) ?
- $args[2] : [];
- $options['timeout'] = $args[1];
- $caller = __METHOD__;
- }
- return Http::request( 'GET', $url, $options, $caller );
- }
-
- /**
- * Simple wrapper for Http::request( 'POST' )
- * @see Http::request()
- *
- * @param string $url
- * @param array $options
- * @param string $caller The method making this request, for profiling
- * @return string|bool false on error
- */
- public static function post( $url, $options = [], $caller = __METHOD__ ) {
- return Http::request( 'POST', $url, $options, $caller );
- }
-
- /**
- * A standard user-agent we can use for external requests.
- * @return string
- */
- public static function userAgent() {
- global $wgVersion;
- return "MediaWiki/$wgVersion";
- }
-
- /**
- * Checks that the given URI is a valid one. Hardcoding the
- * protocols, because we only want protocols that both cURL
- * and php support.
- *
- * file:// should not be allowed here for security purpose (r67684)
- *
- * @todo FIXME this is wildly inaccurate and fails to actually check most stuff
- *
- * @param string $uri URI to check for validity
- * @return bool
- */
- public static function isValidURI( $uri ) {
- return preg_match(
- '/^https?:\/\/[^\/\s]\S*$/D',
- $uri
- );
- }
-
- /**
- * Gets the relevant proxy from $wgHTTPProxy
- *
- * @return mixed The proxy address or an empty string if not set.
- */
- public static function getProxy() {
- global $wgHTTPProxy;
-
- if ( $wgHTTPProxy ) {
- return $wgHTTPProxy;
- }
-
- return "";
- }
-}
-
-/**
- * This wrapper class will call out to curl (if available) or fallback
- * to regular PHP if necessary for handling internal HTTP requests.
- *
- * Renamed from HttpRequest to MWHttpRequest to avoid conflict with
- * PHP's HTTP extension.
- */
-class MWHttpRequest {
- const SUPPORTS_FILE_POSTS = false;
-
- protected $content;
- protected $timeout = 'default';
- protected $headersOnly = null;
- protected $postData = null;
- protected $proxy = null;
- protected $noProxy = false;
- protected $sslVerifyHost = true;
- protected $sslVerifyCert = true;
- protected $caInfo = null;
- protected $method = "GET";
- protected $reqHeaders = [];
- protected $url;
- protected $parsedUrl;
- protected $callback;
- protected $maxRedirects = 5;
- protected $followRedirects = false;
-
- /**
- * @var CookieJar
- */
- protected $cookieJar;
-
- protected $headerList = [];
- protected $respVersion = "0.9";
- protected $respStatus = "200 Ok";
- protected $respHeaders = [];
-
- public $status;
-
- /**
- * @var Profiler
- */
- protected $profiler;
-
- /**
- * @var string
- */
- protected $profileName;
-
- /**
- * @param string $url Url to use. If protocol-relative, will be expanded to an http:// URL
- * @param array $options (optional) extra params to pass (see Http::request())
- * @param string $caller The method making this request, for profiling
- * @param Profiler $profiler An instance of the profiler for profiling, or null
- */
- protected function __construct(
- $url, $options = [], $caller = __METHOD__, $profiler = null
- ) {
- global $wgHTTPTimeout, $wgHTTPConnectTimeout;
-
- $this->url = wfExpandUrl( $url, PROTO_HTTP );
- $this->parsedUrl = wfParseUrl( $this->url );
-
- if ( !$this->parsedUrl || !Http::isValidURI( $this->url ) ) {
- $this->status = Status::newFatal( 'http-invalid-url', $url );
- } else {
- $this->status = Status::newGood( 100 ); // continue
- }
-
- if ( isset( $options['timeout'] ) && $options['timeout'] != 'default' ) {
- $this->timeout = $options['timeout'];
- } else {
- $this->timeout = $wgHTTPTimeout;
- }
- if ( isset( $options['connectTimeout'] ) && $options['connectTimeout'] != 'default' ) {
- $this->connectTimeout = $options['connectTimeout'];
- } else {
- $this->connectTimeout = $wgHTTPConnectTimeout;
- }
- if ( isset( $options['userAgent'] ) ) {
- $this->setUserAgent( $options['userAgent'] );
- }
-
- $members = [ "postData", "proxy", "noProxy", "sslVerifyHost", "caInfo",
- "method", "followRedirects", "maxRedirects", "sslVerifyCert", "callback" ];
-
- foreach ( $members as $o ) {
- if ( isset( $options[$o] ) ) {
- // ensure that MWHttpRequest::method is always
- // uppercased. Bug 36137
- if ( $o == 'method' ) {
- $options[$o] = strtoupper( $options[$o] );
- }
- $this->$o = $options[$o];
- }
- }
-
- if ( $this->noProxy ) {
- $this->proxy = ''; // noProxy takes precedence
- }
-
- // Profile based on what's calling us
- $this->profiler = $profiler;
- $this->profileName = $caller;
- }
-
- /**
- * Simple function to test if we can make any sort of requests at all, using
- * cURL or fopen()
- * @return bool
- */
- public static function canMakeRequests() {
- return function_exists( 'curl_init' ) || wfIniGetBool( 'allow_url_fopen' );
- }
-
- /**
- * Generate a new request object
- * @param string $url Url to use
- * @param array $options (optional) extra params to pass (see Http::request())
- * @param string $caller The method making this request, for profiling
- * @throws MWException
- * @return CurlHttpRequest|PhpHttpRequest
- * @see MWHttpRequest::__construct
- */
- public static function factory( $url, $options = null, $caller = __METHOD__ ) {
- if ( !Http::$httpEngine ) {
- Http::$httpEngine = function_exists( 'curl_init' ) ? 'curl' : 'php';
- } elseif ( Http::$httpEngine == 'curl' && !function_exists( 'curl_init' ) ) {
- throw new MWException( __METHOD__ . ': curl (http://php.net/curl) is not installed, but' .
- ' Http::$httpEngine is set to "curl"' );
- }
-
- switch ( Http::$httpEngine ) {
- case 'curl':
- return new CurlHttpRequest( $url, $options, $caller, Profiler::instance() );
- case 'php':
- if ( !wfIniGetBool( 'allow_url_fopen' ) ) {
- throw new MWException( __METHOD__ . ': allow_url_fopen ' .
- 'needs to be enabled for pure PHP http requests to ' .
- 'work. If possible, curl should be used instead. See ' .
- 'http://php.net/curl.'
- );
- }
- return new PhpHttpRequest( $url, $options, $caller, Profiler::instance() );
- default:
- throw new MWException( __METHOD__ . ': The setting of Http::$httpEngine is not valid.' );
- }
- }
-
- /**
- * Get the body, or content, of the response to the request
- *
- * @return string
- */
- public function getContent() {
- return $this->content;
- }
-
- /**
- * Set the parameters of the request
- *
- * @param array $args
- * @todo overload the args param
- */
- public function setData( $args ) {
- $this->postData = $args;
- }
-
- /**
- * Take care of setting up the proxy (do nothing if "noProxy" is set)
- *
- * @return void
- */
- public function proxySetup() {
- // If there is an explicit proxy set and proxies are not disabled, then use it
- if ( $this->proxy && !$this->noProxy ) {
- return;
- }
-
- // Otherwise, fallback to $wgHTTPProxy if this is not a machine
- // local URL and proxies are not disabled
- if ( self::isLocalURL( $this->url ) || $this->noProxy ) {
- $this->proxy = '';
- } else {
- $this->proxy = Http::getProxy();
- }
- }
-
- /**
- * Check if the URL can be served by localhost
- *
- * @param string $url Full url to check
- * @return bool
- */
- private static function isLocalURL( $url ) {
- global $wgCommandLineMode, $wgLocalVirtualHosts;
-
- if ( $wgCommandLineMode ) {
- return false;
- }
-
- // Extract host part
- $matches = [];
- if ( preg_match( '!^https?://([\w.-]+)[/:].*$!', $url, $matches ) ) {
- $host = $matches[1];
- // Split up dotwise
- $domainParts = explode( '.', $host );
- // Check if this domain or any superdomain is listed as a local virtual host
- $domainParts = array_reverse( $domainParts );
-
- $domain = '';
- $countParts = count( $domainParts );
- for ( $i = 0; $i < $countParts; $i++ ) {
- $domainPart = $domainParts[$i];
- if ( $i == 0 ) {
- $domain = $domainPart;
- } else {
- $domain = $domainPart . '.' . $domain;
- }
-
- if ( in_array( $domain, $wgLocalVirtualHosts ) ) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Set the user agent
- * @param string $UA
- */
- public function setUserAgent( $UA ) {
- $this->setHeader( 'User-Agent', $UA );
- }
-
- /**
- * Set an arbitrary header
- * @param string $name
- * @param string $value
- */
- public function setHeader( $name, $value ) {
- // I feel like I should normalize the case here...
- $this->reqHeaders[$name] = $value;
- }
-
- /**
- * Get an array of the headers
- * @return array
- */
- public function getHeaderList() {
- $list = [];
-
- if ( $this->cookieJar ) {
- $this->reqHeaders['Cookie'] =
- $this->cookieJar->serializeToHttpRequest(
- $this->parsedUrl['path'],
- $this->parsedUrl['host']
- );
- }
-
- foreach ( $this->reqHeaders as $name => $value ) {
- $list[] = "$name: $value";
- }
-
- return $list;
- }
-
- /**
- * Set a read callback to accept data read from the HTTP request.
- * By default, data is appended to an internal buffer which can be
- * retrieved through $req->getContent().
- *
- * To handle data as it comes in -- especially for large files that
- * would not fit in memory -- you can instead set your own callback,
- * in the form function($resource, $buffer) where the first parameter
- * is the low-level resource being read (implementation specific),
- * and the second parameter is the data buffer.
- *
- * You MUST return the number of bytes handled in the buffer; if fewer
- * bytes are reported handled than were passed to you, the HTTP fetch
- * will be aborted.
- *
- * @param callable $callback
- * @throws MWException
- */
- public function setCallback( $callback ) {
- if ( !is_callable( $callback ) ) {
- throw new MWException( 'Invalid MwHttpRequest callback' );
- }
- $this->callback = $callback;
- }
-
- /**
- * A generic callback to read the body of the response from a remote
- * server.
- *
- * @param resource $fh
- * @param string $content
- * @return int
- */
- public function read( $fh, $content ) {
- $this->content .= $content;
- return strlen( $content );
- }
-
- /**
- * Take care of whatever is necessary to perform the URI request.
- *
- * @return Status
- */
- public function execute() {
-
- $this->content = "";
-
- if ( strtoupper( $this->method ) == "HEAD" ) {
- $this->headersOnly = true;
- }
-
- $this->proxySetup(); // set up any proxy as needed
-
- if ( !$this->callback ) {
- $this->setCallback( [ $this, 'read' ] );
- }
-
- if ( !isset( $this->reqHeaders['User-Agent'] ) ) {
- $this->setUserAgent( Http::userAgent() );
- }
-
- }
-
- /**
- * Parses the headers, including the HTTP status code and any
- * Set-Cookie headers. This function expects the headers to be
- * found in an array in the member variable headerList.
- */
- protected function parseHeader() {
-
- $lastname = "";
-
- foreach ( $this->headerList as $header ) {
- if ( preg_match( "#^HTTP/([0-9.]+) (.*)#", $header, $match ) ) {
- $this->respVersion = $match[1];
- $this->respStatus = $match[2];
- } elseif ( preg_match( "#^[ \t]#", $header ) ) {
- $last = count( $this->respHeaders[$lastname] ) - 1;
- $this->respHeaders[$lastname][$last] .= "\r\n$header";
- } elseif ( preg_match( "#^([^:]*):[\t ]*(.*)#", $header, $match ) ) {
- $this->respHeaders[strtolower( $match[1] )][] = $match[2];
- $lastname = strtolower( $match[1] );
- }
- }
-
- $this->parseCookies();
-
- }
-
- /**
- * Sets HTTPRequest status member to a fatal value with the error
- * message if the returned integer value of the status code was
- * not successful (< 300) or a redirect (>=300 and < 400). (see
- * RFC2616, section 10,
- * http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html for a
- * list of status codes.)
- */
- protected function setStatus() {
- if ( !$this->respHeaders ) {
- $this->parseHeader();
- }
-
- if ( (int)$this->respStatus > 399 ) {
- list( $code, $message ) = explode( " ", $this->respStatus, 2 );
- $this->status->fatal( "http-bad-status", $code, $message );
- }
- }
-
- /**
- * Get the integer value of the HTTP status code (e.g. 200 for "200 Ok")
- * (see RFC2616, section 10, http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
- * for a list of status codes.)
- *
- * @return int
- */
- public function getStatus() {
- if ( !$this->respHeaders ) {
- $this->parseHeader();
- }
-
- return (int)$this->respStatus;
- }
-
- /**
- * Returns true if the last status code was a redirect.
- *
- * @return bool
- */
- public function isRedirect() {
- if ( !$this->respHeaders ) {
- $this->parseHeader();
- }
-
- $status = (int)$this->respStatus;
-
- if ( $status >= 300 && $status <= 303 ) {
- return true;
- }
-
- return false;
- }
-
- /**
- * Returns an associative array of response headers after the
- * request has been executed. Because some headers
- * (e.g. Set-Cookie) can appear more than once the, each value of
- * the associative array is an array of the values given.
- *
- * @return array
- */
- public function getResponseHeaders() {
- if ( !$this->respHeaders ) {
- $this->parseHeader();
- }
-
- return $this->respHeaders;
- }
-
- /**
- * Returns the value of the given response header.
- *
- * @param string $header
- * @return string|null
- */
- public function getResponseHeader( $header ) {
- if ( !$this->respHeaders ) {
- $this->parseHeader();
- }
-
- if ( isset( $this->respHeaders[strtolower( $header )] ) ) {
- $v = $this->respHeaders[strtolower( $header )];
- return $v[count( $v ) - 1];
- }
-
- return null;
- }
-
- /**
- * Tells the MWHttpRequest object to use this pre-loaded CookieJar.
- *
- * @param CookieJar $jar
- */
- public function setCookieJar( $jar ) {
- $this->cookieJar = $jar;
- }
-
- /**
- * Returns the cookie jar in use.
- *
- * @return CookieJar
- */
- public function getCookieJar() {
- if ( !$this->respHeaders ) {
- $this->parseHeader();
- }
-
- return $this->cookieJar;
- }
-
- /**
- * Sets a cookie. Used before a request to set up any individual
- * cookies. Used internally after a request to parse the
- * Set-Cookie headers.
- * @see Cookie::set
- * @param string $name
- * @param mixed $value
- * @param array $attr
- */
- public function setCookie( $name, $value = null, $attr = null ) {
- if ( !$this->cookieJar ) {
- $this->cookieJar = new CookieJar;
- }
-
- $this->cookieJar->setCookie( $name, $value, $attr );
- }
-
- /**
- * Parse the cookies in the response headers and store them in the cookie jar.
- */
- protected function parseCookies() {
-
- if ( !$this->cookieJar ) {
- $this->cookieJar = new CookieJar;
- }
-
- if ( isset( $this->respHeaders['set-cookie'] ) ) {
- $url = parse_url( $this->getFinalUrl() );
- foreach ( $this->respHeaders['set-cookie'] as $cookie ) {
- $this->cookieJar->parseCookieResponseHeader( $cookie, $url['host'] );
- }
- }
-
- }
-
- /**
- * Returns the final URL after all redirections.
- *
- * Relative values of the "Location" header are incorrect as
- * stated in RFC, however they do happen and modern browsers
- * support them. This function loops backwards through all
- * locations in order to build the proper absolute URI - Marooned
- * at wikia-inc.com
- *
- * Note that the multiple Location: headers are an artifact of
- * CURL -- they shouldn't actually get returned this way. Rewrite
- * this when bug 29232 is taken care of (high-level redirect
- * handling rewrite).
- *
- * @return string
- */
- public function getFinalUrl() {
- $headers = $this->getResponseHeaders();
-
- // return full url (fix for incorrect but handled relative location)
- if ( isset( $headers['location'] ) ) {
- $locations = $headers['location'];
- $domain = '';
- $foundRelativeURI = false;
- $countLocations = count( $locations );
-
- for ( $i = $countLocations - 1; $i >= 0; $i-- ) {
- $url = parse_url( $locations[$i] );
-
- if ( isset( $url['host'] ) ) {
- $domain = $url['scheme'] . '://' . $url['host'];
- break; // found correct URI (with host)
- } else {
- $foundRelativeURI = true;
- }
- }
-
- if ( $foundRelativeURI ) {
- if ( $domain ) {
- return $domain . $locations[$countLocations - 1];
- } else {
- $url = parse_url( $this->url );
- if ( isset( $url['host'] ) ) {
- return $url['scheme'] . '://' . $url['host'] .
- $locations[$countLocations - 1];
- }
- }
- } else {
- return $locations[$countLocations - 1];
- }
- }
-
- return $this->url;
- }
-
- /**
- * Returns true if the backend can follow redirects. Overridden by the
- * child classes.
- * @return bool
- */
- public function canFollowRedirects() {
- return true;
- }
-}
-
-/**
- * MWHttpRequest implemented using internal curl compiled into PHP
- */
-class CurlHttpRequest extends MWHttpRequest {
- const SUPPORTS_FILE_POSTS = true;
-
- protected $curlOptions = [];
- protected $headerText = "";
-
- /**
- * @param resource $fh
- * @param string $content
- * @return int
- */
- protected function readHeader( $fh, $content ) {
- $this->headerText .= $content;
- return strlen( $content );
- }
-
- public function execute() {
-
- parent::execute();
-
- if ( !$this->status->isOK() ) {
- return $this->status;
- }
-
- $this->curlOptions[CURLOPT_PROXY] = $this->proxy;
- $this->curlOptions[CURLOPT_TIMEOUT] = $this->timeout;
-
- // Only supported in curl >= 7.16.2
- if ( defined( 'CURLOPT_CONNECTTIMEOUT_MS' ) ) {
- $this->curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = $this->connectTimeout * 1000;
- }
-
- $this->curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
- $this->curlOptions[CURLOPT_WRITEFUNCTION] = $this->callback;
- $this->curlOptions[CURLOPT_HEADERFUNCTION] = [ $this, "readHeader" ];
- $this->curlOptions[CURLOPT_MAXREDIRS] = $this->maxRedirects;
- $this->curlOptions[CURLOPT_ENCODING] = ""; # Enable compression
-
- $this->curlOptions[CURLOPT_USERAGENT] = $this->reqHeaders['User-Agent'];
-
- $this->curlOptions[CURLOPT_SSL_VERIFYHOST] = $this->sslVerifyHost ? 2 : 0;
- $this->curlOptions[CURLOPT_SSL_VERIFYPEER] = $this->sslVerifyCert;
-
- if ( $this->caInfo ) {
- $this->curlOptions[CURLOPT_CAINFO] = $this->caInfo;
- }
-
- if ( $this->headersOnly ) {
- $this->curlOptions[CURLOPT_NOBODY] = true;
- $this->curlOptions[CURLOPT_HEADER] = true;
- } elseif ( $this->method == 'POST' ) {
- $this->curlOptions[CURLOPT_POST] = true;
- $postData = $this->postData;
- // Don't interpret POST parameters starting with '@' as file uploads, because this
- // makes it impossible to POST plain values starting with '@' (and causes security
- // issues potentially exposing the contents of local files).
- // The PHP manual says this option was introduced in PHP 5.5 defaults to true in PHP 5.6,
- // but we support lower versions, and the option doesn't exist in HHVM 5.6.99.
- if ( defined( 'CURLOPT_SAFE_UPLOAD' ) ) {
- $this->curlOptions[CURLOPT_SAFE_UPLOAD] = true;
- } elseif ( is_array( $postData ) ) {
- // In PHP 5.2 and later, '@' is interpreted as a file upload if POSTFIELDS
- // is an array, but not if it's a string. So convert $req['body'] to a string
- // for safety.
- $postData = wfArrayToCgi( $postData );
- }
- $this->curlOptions[CURLOPT_POSTFIELDS] = $postData;
-
- // Suppress 'Expect: 100-continue' header, as some servers
- // will reject it with a 417 and Curl won't auto retry
- // with HTTP 1.0 fallback
- $this->reqHeaders['Expect'] = '';
- } else {
- $this->curlOptions[CURLOPT_CUSTOMREQUEST] = $this->method;
- }
-
- $this->curlOptions[CURLOPT_HTTPHEADER] = $this->getHeaderList();
-
- $curlHandle = curl_init( $this->url );
-
- if ( !curl_setopt_array( $curlHandle, $this->curlOptions ) ) {
- throw new MWException( "Error setting curl options." );
- }
-
- if ( $this->followRedirects && $this->canFollowRedirects() ) {
- MediaWiki\suppressWarnings();
- if ( !curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) {
- wfDebug( __METHOD__ . ": Couldn't set CURLOPT_FOLLOWLOCATION. " .
- "Probably open_basedir is set.\n" );
- // Continue the processing. If it were in curl_setopt_array,
- // processing would have halted on its entry
- }
- MediaWiki\restoreWarnings();
- }
-
- if ( $this->profiler ) {
- $profileSection = $this->profiler->scopedProfileIn(
- __METHOD__ . '-' . $this->profileName
- );
- }
-
- $curlRes = curl_exec( $curlHandle );
- if ( curl_errno( $curlHandle ) == CURLE_OPERATION_TIMEOUTED ) {
- $this->status->fatal( 'http-timed-out', $this->url );
- } elseif ( $curlRes === false ) {
- $this->status->fatal( 'http-curl-error', curl_error( $curlHandle ) );
- } else {
- $this->headerList = explode( "\r\n", $this->headerText );
- }
-
- curl_close( $curlHandle );
-
- if ( $this->profiler ) {
- $this->profiler->scopedProfileOut( $profileSection );
- }
-
- $this->parseHeader();
- $this->setStatus();
-
- return $this->status;
- }
-
- /**
- * @return bool
- */
- public function canFollowRedirects() {
- $curlVersionInfo = curl_version();
- if ( $curlVersionInfo['version_number'] < 0x071304 ) {
- wfDebug( "Cannot follow redirects with libcurl < 7.19.4 due to CVE-2009-0037\n" );
- return false;
- }
-
- if ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
- if ( strval( ini_get( 'open_basedir' ) ) !== '' ) {
- wfDebug( "Cannot follow redirects when open_basedir is set\n" );
- return false;
- }
- }
-
- return true;
- }
-}
-
-class PhpHttpRequest extends MWHttpRequest {
-
- private $fopenErrors = [];
-
- /**
- * @param string $url
- * @return string
- */
- protected function urlToTcp( $url ) {
- $parsedUrl = parse_url( $url );
-
- return 'tcp://' . $parsedUrl['host'] . ':' . $parsedUrl['port'];
- }
-
- /**
- * Returns an array with a 'capath' or 'cafile' key
- * that is suitable to be merged into the 'ssl' sub-array of
- * a stream context options array.
- * Uses the 'caInfo' option of the class if it is provided, otherwise uses the system
- * default CA bundle if PHP supports that, or searches a few standard locations.
- * @return array
- * @throws DomainException
- */
- protected function getCertOptions() {
- $certOptions = [];
- $certLocations = [];
- if ( $this->caInfo ) {
- $certLocations = [ 'manual' => $this->caInfo ];
- } elseif ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
- // @codingStandardsIgnoreStart Generic.Files.LineLength
- // Default locations, based on
- // https://www.happyassassin.net/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
- // PHP 5.5 and older doesn't have any defaults, so we try to guess ourselves.
- // PHP 5.6+ gets the CA location from OpenSSL as long as it is not set manually,
- // so we should leave capath/cafile empty there.
- // @codingStandardsIgnoreEnd
- $certLocations = array_filter( [
- getenv( 'SSL_CERT_DIR' ),
- getenv( 'SSL_CERT_PATH' ),
- '/etc/pki/tls/certs/ca-bundle.crt', # Fedora et al
- '/etc/ssl/certs', # Debian et al
- '/etc/pki/tls/certs/ca-bundle.trust.crt',
- '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem',
- '/System/Library/OpenSSL', # OSX
- ] );
- }
-
- foreach ( $certLocations as $key => $cert ) {
- if ( is_dir( $cert ) ) {
- $certOptions['capath'] = $cert;
- break;
- } elseif ( is_file( $cert ) ) {
- $certOptions['cafile'] = $cert;
- break;
- } elseif ( $key === 'manual' ) {
- // fail more loudly if a cert path was manually configured and it is not valid
- throw new DomainException( "Invalid CA info passed: $cert" );
- }
- }
-
- return $certOptions;
- }
-
- /**
- * Custom error handler for dealing with fopen() errors.
- * fopen() tends to fire multiple errors in succession, and the last one
- * is completely useless (something like "fopen: failed to open stream")
- * so normal methods of handling errors programmatically
- * like get_last_error() don't work.
- */
- public function errorHandler( $errno, $errstr ) {
- $n = count( $this->fopenErrors ) + 1;
- $this->fopenErrors += [ "errno$n" => $errno, "errstr$n" => $errstr ];
- }
-
- public function execute() {
-
- parent::execute();
-
- if ( is_array( $this->postData ) ) {
- $this->postData = wfArrayToCgi( $this->postData );
- }
-
- if ( $this->parsedUrl['scheme'] != 'http'
- && $this->parsedUrl['scheme'] != 'https' ) {
- $this->status->fatal( 'http-invalid-scheme', $this->parsedUrl['scheme'] );
- }
-
- $this->reqHeaders['Accept'] = "*/*";
- $this->reqHeaders['Connection'] = 'Close';
- if ( $this->method == 'POST' ) {
- // Required for HTTP 1.0 POSTs
- $this->reqHeaders['Content-Length'] = strlen( $this->postData );
- if ( !isset( $this->reqHeaders['Content-Type'] ) ) {
- $this->reqHeaders['Content-Type'] = "application/x-www-form-urlencoded";
- }
- }
-
- // Set up PHP stream context
- $options = [
- 'http' => [
- 'method' => $this->method,
- 'header' => implode( "\r\n", $this->getHeaderList() ),
- 'protocol_version' => '1.1',
- 'max_redirects' => $this->followRedirects ? $this->maxRedirects : 0,
- 'ignore_errors' => true,
- 'timeout' => $this->timeout,
- // Curl options in case curlwrappers are installed
- 'curl_verify_ssl_host' => $this->sslVerifyHost ? 2 : 0,
- 'curl_verify_ssl_peer' => $this->sslVerifyCert,
- ],
- 'ssl' => [
- 'verify_peer' => $this->sslVerifyCert,
- 'SNI_enabled' => true,
- 'ciphers' => 'HIGH:!SSLv2:!SSLv3:-ADH:-kDH:-kECDH:-DSS',
- 'disable_compression' => true,
- ],
- ];
-
- if ( $this->proxy ) {
- $options['http']['proxy'] = $this->urlToTcp( $this->proxy );
- $options['http']['request_fulluri'] = true;
- }
-
- if ( $this->postData ) {
- $options['http']['content'] = $this->postData;
- }
-
- if ( $this->sslVerifyHost ) {
- // PHP 5.6.0 deprecates CN_match, in favour of peer_name which
- // actually checks SubjectAltName properly.
- if ( version_compare( PHP_VERSION, '5.6.0', '>=' ) ) {
- $options['ssl']['peer_name'] = $this->parsedUrl['host'];
- } else {
- $options['ssl']['CN_match'] = $this->parsedUrl['host'];
- }
- }
-
- $options['ssl'] += $this->getCertOptions();
-
- $context = stream_context_create( $options );
-
- $this->headerList = [];
- $reqCount = 0;
- $url = $this->url;
-
- $result = [];
-
- if ( $this->profiler ) {
- $profileSection = $this->profiler->scopedProfileIn(
- __METHOD__ . '-' . $this->profileName
- );
- }
- do {
- $reqCount++;
- $this->fopenErrors = [];
- set_error_handler( [ $this, 'errorHandler' ] );
- $fh = fopen( $url, "r", false, $context );
- restore_error_handler();
-
- if ( !$fh ) {
- // HACK for instant commons.
- // If we are contacting (commons|upload).wikimedia.org
- // try again with CN_match for en.wikipedia.org
- // as php does not handle SubjectAltName properly
- // prior to "peer_name" option in php 5.6
- if ( isset( $options['ssl']['CN_match'] )
- && ( $options['ssl']['CN_match'] === 'commons.wikimedia.org'
- || $options['ssl']['CN_match'] === 'upload.wikimedia.org' )
- ) {
- $options['ssl']['CN_match'] = 'en.wikipedia.org';
- $context = stream_context_create( $options );
- continue;
- }
- break;
- }
-
- $result = stream_get_meta_data( $fh );
- $this->headerList = $result['wrapper_data'];
- $this->parseHeader();
-
- if ( !$this->followRedirects ) {
- break;
- }
-
- # Handle manual redirection
- if ( !$this->isRedirect() || $reqCount > $this->maxRedirects ) {
- break;
- }
- # Check security of URL
- $url = $this->getResponseHeader( "Location" );
-
- if ( !Http::isValidURI( $url ) ) {
- wfDebug( __METHOD__ . ": insecure redirection\n" );
- break;
- }
- } while ( true );
- if ( $this->profiler ) {
- $this->profiler->scopedProfileOut( $profileSection );
- }
-
- $this->setStatus();
-
- if ( $fh === false ) {
- if ( $this->fopenErrors ) {
- LoggerFactory::getInstance( 'http' )->warning( __CLASS__
- . ': error opening connection: {errstr1}', $this->fopenErrors );
- }
- $this->status->fatal( 'http-request-error' );
- return $this->status;
- }
-
- if ( $result['timed_out'] ) {
- $this->status->fatal( 'http-timed-out', $this->url );
- return $this->status;
- }
-
- // If everything went OK, or we received some error code
- // get the response body content.
- if ( $this->status->isOK() || (int)$this->respStatus >= 300 ) {
- while ( !feof( $fh ) ) {
- $buf = fread( $fh, 8192 );
-
- if ( $buf === false ) {
- $this->status->fatal( 'http-read-error' );
- break;
- }
-
- if ( strlen( $buf ) ) {
- call_user_func( $this->callback, $fh, $buf );
- }
- }
- }
- fclose( $fh );
-
- return $this->status;
- }
-}
// Fail nicely if article doesn't exist.
if ( !$this->page->exists() ) {
+ global $wgSend404Code;
+ if ( $wgSend404Code ) {
+ $out->setStatusCode( 404 );
+ }
$out->addWikiMsg( 'nohistory' );
# show deletion/move log if there is an entry
LogEventsList::showLogExtract(
$context->getTitle()->resetArticleID( 0 );
}
+ $contLang = $config->get( 'ContLang' );
$context->getOutput()->sendCacheControl();
header( "Content-Type: {$config->get( 'MimeType' )}; charset=UTF-8" );
- header( "Content-Language: {$config->get( 'LanguageCode' )}" );
+ header( "Content-Language: {$contLang->getHtmlCode()}" );
if ( $this->useGzip() ) {
if ( wfClientAcceptsGzip() ) {
header( 'Content-Encoding: gzip' );
--- /dev/null
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * MWHttpRequest implemented using internal curl compiled into PHP
+ */
+class CurlHttpRequest extends MWHttpRequest {
+ const SUPPORTS_FILE_POSTS = true;
+
+ protected $curlOptions = [];
+ protected $headerText = "";
+
+ /**
+ * @param resource $fh
+ * @param string $content
+ * @return int
+ */
+ protected function readHeader( $fh, $content ) {
+ $this->headerText .= $content;
+ return strlen( $content );
+ }
+
+ public function execute() {
+
+ parent::execute();
+
+ if ( !$this->status->isOK() ) {
+ return $this->status;
+ }
+
+ $this->curlOptions[CURLOPT_PROXY] = $this->proxy;
+ $this->curlOptions[CURLOPT_TIMEOUT] = $this->timeout;
+
+ // Only supported in curl >= 7.16.2
+ if ( defined( 'CURLOPT_CONNECTTIMEOUT_MS' ) ) {
+ $this->curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = $this->connectTimeout * 1000;
+ }
+
+ $this->curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
+ $this->curlOptions[CURLOPT_WRITEFUNCTION] = $this->callback;
+ $this->curlOptions[CURLOPT_HEADERFUNCTION] = [ $this, "readHeader" ];
+ $this->curlOptions[CURLOPT_MAXREDIRS] = $this->maxRedirects;
+ $this->curlOptions[CURLOPT_ENCODING] = ""; # Enable compression
+
+ $this->curlOptions[CURLOPT_USERAGENT] = $this->reqHeaders['User-Agent'];
+
+ $this->curlOptions[CURLOPT_SSL_VERIFYHOST] = $this->sslVerifyHost ? 2 : 0;
+ $this->curlOptions[CURLOPT_SSL_VERIFYPEER] = $this->sslVerifyCert;
+
+ if ( $this->caInfo ) {
+ $this->curlOptions[CURLOPT_CAINFO] = $this->caInfo;
+ }
+
+ if ( $this->headersOnly ) {
+ $this->curlOptions[CURLOPT_NOBODY] = true;
+ $this->curlOptions[CURLOPT_HEADER] = true;
+ } elseif ( $this->method == 'POST' ) {
+ $this->curlOptions[CURLOPT_POST] = true;
+ $postData = $this->postData;
+ // Don't interpret POST parameters starting with '@' as file uploads, because this
+ // makes it impossible to POST plain values starting with '@' (and causes security
+ // issues potentially exposing the contents of local files).
+ // The PHP manual says this option was introduced in PHP 5.5 defaults to true in PHP 5.6,
+ // but we support lower versions, and the option doesn't exist in HHVM 5.6.99.
+ if ( defined( 'CURLOPT_SAFE_UPLOAD' ) ) {
+ $this->curlOptions[CURLOPT_SAFE_UPLOAD] = true;
+ } elseif ( is_array( $postData ) ) {
+ // In PHP 5.2 and later, '@' is interpreted as a file upload if POSTFIELDS
+ // is an array, but not if it's a string. So convert $req['body'] to a string
+ // for safety.
+ $postData = wfArrayToCgi( $postData );
+ }
+ $this->curlOptions[CURLOPT_POSTFIELDS] = $postData;
+
+ // Suppress 'Expect: 100-continue' header, as some servers
+ // will reject it with a 417 and Curl won't auto retry
+ // with HTTP 1.0 fallback
+ $this->reqHeaders['Expect'] = '';
+ } else {
+ $this->curlOptions[CURLOPT_CUSTOMREQUEST] = $this->method;
+ }
+
+ $this->curlOptions[CURLOPT_HTTPHEADER] = $this->getHeaderList();
+
+ $curlHandle = curl_init( $this->url );
+
+ if ( !curl_setopt_array( $curlHandle, $this->curlOptions ) ) {
+ throw new MWException( "Error setting curl options." );
+ }
+
+ if ( $this->followRedirects && $this->canFollowRedirects() ) {
+ MediaWiki\suppressWarnings();
+ if ( !curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) {
+ $this->logger->debug( __METHOD__ . ": Couldn't set CURLOPT_FOLLOWLOCATION. " .
+ "Probably open_basedir is set.\n" );
+ // Continue the processing. If it were in curl_setopt_array,
+ // processing would have halted on its entry
+ }
+ MediaWiki\restoreWarnings();
+ }
+
+ if ( $this->profiler ) {
+ $profileSection = $this->profiler->scopedProfileIn(
+ __METHOD__ . '-' . $this->profileName
+ );
+ }
+
+ $curlRes = curl_exec( $curlHandle );
+ if ( curl_errno( $curlHandle ) == CURLE_OPERATION_TIMEOUTED ) {
+ $this->status->fatal( 'http-timed-out', $this->url );
+ } elseif ( $curlRes === false ) {
+ $this->status->fatal( 'http-curl-error', curl_error( $curlHandle ) );
+ } else {
+ $this->headerList = explode( "\r\n", $this->headerText );
+ }
+
+ curl_close( $curlHandle );
+
+ if ( $this->profiler ) {
+ $this->profiler->scopedProfileOut( $profileSection );
+ }
+
+ $this->parseHeader();
+ $this->setStatus();
+
+ return $this->status;
+ }
+
+ /**
+ * @return bool
+ */
+ public function canFollowRedirects() {
+ $curlVersionInfo = curl_version();
+ if ( $curlVersionInfo['version_number'] < 0x071304 ) {
+ $this->logger->debug( "Cannot follow redirects with libcurl < 7.19.4 due to CVE-2009-0037\n" );
+ return false;
+ }
+
+ if ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
+ if ( strval( ini_get( 'open_basedir' ) ) !== '' ) {
+ $this->logger->debug( "Cannot follow redirects when open_basedir is set\n" );
+ return false;
+ }
+ }
+
+ return true;
+ }
+}
--- /dev/null
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+use MediaWiki\Logger\LoggerFactory;
+
+/**
+ * Various HTTP related functions
+ * @ingroup HTTP
+ */
+class Http {
+ static public $httpEngine = false;
+
+ /**
+ * Perform an HTTP request
+ *
+ * @param string $method HTTP method. Usually GET/POST
+ * @param string $url Full URL to act on. If protocol-relative, will be expanded to an http:// URL
+ * @param array $options Options to pass to MWHttpRequest object.
+ * Possible keys for the array:
+ * - timeout Timeout length in seconds
+ * - connectTimeout Timeout for connection, in seconds (curl only)
+ * - postData An array of key-value pairs or a url-encoded form data
+ * - proxy The proxy to use.
+ * Otherwise it will use $wgHTTPProxy (if set)
+ * Otherwise it will use the environment variable "http_proxy" (if set)
+ * - noProxy Don't use any proxy at all. Takes precedence over proxy value(s).
+ * - sslVerifyHost Verify hostname against certificate
+ * - sslVerifyCert Verify SSL certificate
+ * - caInfo Provide CA information
+ * - maxRedirects Maximum number of redirects to follow (defaults to 5)
+ * - followRedirects Whether to follow redirects (defaults to false).
+ * Note: this should only be used when the target URL is trusted,
+ * to avoid attacks on intranet services accessible by HTTP.
+ * - userAgent A user agent, if you want to override the default
+ * MediaWiki/$wgVersion
+ * - logger A \Psr\Logger\LoggerInterface instance for debug logging
+ * @param string $caller The method making this request, for profiling
+ * @return string|bool (bool)false on failure or a string on success
+ */
+ public static function request( $method, $url, $options = [], $caller = __METHOD__ ) {
+ wfDebug( "HTTP: $method: $url\n" );
+
+ $options['method'] = strtoupper( $method );
+
+ if ( !isset( $options['timeout'] ) ) {
+ $options['timeout'] = 'default';
+ }
+ if ( !isset( $options['connectTimeout'] ) ) {
+ $options['connectTimeout'] = 'default';
+ }
+
+ $req = MWHttpRequest::factory( $url, $options, $caller );
+ $status = $req->execute();
+
+ if ( $status->isOK() ) {
+ return $req->getContent();
+ } else {
+ $errors = $status->getErrorsByType( 'error' );
+ $logger = LoggerFactory::getInstance( 'http' );
+ $logger->warning( $status->getWikiText( false, false, 'en' ),
+ [ 'error' => $errors, 'caller' => $caller, 'content' => $req->getContent() ] );
+ return false;
+ }
+ }
+
+ /**
+ * Simple wrapper for Http::request( 'GET' )
+ * @see Http::request()
+ * @since 1.25 Second parameter $timeout removed. Second parameter
+ * is now $options which can be given a 'timeout'
+ *
+ * @param string $url
+ * @param array $options
+ * @param string $caller The method making this request, for profiling
+ * @return string|bool false on error
+ */
+ public static function get( $url, $options = [], $caller = __METHOD__ ) {
+ $args = func_get_args();
+ if ( isset( $args[1] ) && ( is_string( $args[1] ) || is_numeric( $args[1] ) ) ) {
+ // Second was used to be the timeout
+ // And third parameter used to be $options
+ wfWarn( "Second parameter should not be a timeout.", 2 );
+ $options = isset( $args[2] ) && is_array( $args[2] ) ?
+ $args[2] : [];
+ $options['timeout'] = $args[1];
+ $caller = __METHOD__;
+ }
+ return Http::request( 'GET', $url, $options, $caller );
+ }
+
+ /**
+ * Simple wrapper for Http::request( 'POST' )
+ * @see Http::request()
+ *
+ * @param string $url
+ * @param array $options
+ * @param string $caller The method making this request, for profiling
+ * @return string|bool false on error
+ */
+ public static function post( $url, $options = [], $caller = __METHOD__ ) {
+ return Http::request( 'POST', $url, $options, $caller );
+ }
+
+ /**
+ * A standard user-agent we can use for external requests.
+ * @return string
+ */
+ public static function userAgent() {
+ global $wgVersion;
+ return "MediaWiki/$wgVersion";
+ }
+
+ /**
+ * Checks that the given URI is a valid one. Hardcoding the
+ * protocols, because we only want protocols that both cURL
+ * and php support.
+ *
+ * file:// should not be allowed here for security purpose (r67684)
+ *
+ * @todo FIXME this is wildly inaccurate and fails to actually check most stuff
+ *
+ * @param string $uri URI to check for validity
+ * @return bool
+ */
+ public static function isValidURI( $uri ) {
+ return preg_match(
+ '/^https?:\/\/[^\/\s]\S*$/D',
+ $uri
+ );
+ }
+
+ /**
+ * Gets the relevant proxy from $wgHTTPProxy
+ *
+ * @return mixed The proxy address or an empty string if not set.
+ */
+ public static function getProxy() {
+ global $wgHTTPProxy;
+
+ if ( $wgHTTPProxy ) {
+ return $wgHTTPProxy;
+ }
+
+ return "";
+ }
+}
--- /dev/null
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+use MediaWiki\Logger\LoggerFactory;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\NullLogger;
+
+/**
+ * This wrapper class will call out to curl (if available) or fallback
+ * to regular PHP if necessary for handling internal HTTP requests.
+ *
+ * Renamed from HttpRequest to MWHttpRequest to avoid conflict with
+ * PHP's HTTP extension.
+ */
+class MWHttpRequest implements LoggerAwareInterface {
+ const SUPPORTS_FILE_POSTS = false;
+
+ protected $content;
+ protected $timeout = 'default';
+ protected $headersOnly = null;
+ protected $postData = null;
+ protected $proxy = null;
+ protected $noProxy = false;
+ protected $sslVerifyHost = true;
+ protected $sslVerifyCert = true;
+ protected $caInfo = null;
+ protected $method = "GET";
+ protected $reqHeaders = [];
+ protected $url;
+ protected $parsedUrl;
+ protected $callback;
+ protected $maxRedirects = 5;
+ protected $followRedirects = false;
+
+ /**
+ * @var CookieJar
+ */
+ protected $cookieJar;
+
+ protected $headerList = [];
+ protected $respVersion = "0.9";
+ protected $respStatus = "200 Ok";
+ protected $respHeaders = [];
+
+ public $status;
+
+ /**
+ * @var Profiler
+ */
+ protected $profiler;
+
+ /**
+ * @var string
+ */
+ protected $profileName;
+
+ /**
+ * @var LoggerInterface;
+ */
+ protected $logger;
+
+ /**
+ * @param string $url Url to use. If protocol-relative, will be expanded to an http:// URL
+ * @param array $options (optional) extra params to pass (see Http::request())
+ * @param string $caller The method making this request, for profiling
+ * @param Profiler $profiler An instance of the profiler for profiling, or null
+ */
+ protected function __construct(
+ $url, $options = [], $caller = __METHOD__, $profiler = null
+ ) {
+ global $wgHTTPTimeout, $wgHTTPConnectTimeout;
+
+ $this->url = wfExpandUrl( $url, PROTO_HTTP );
+ $this->parsedUrl = wfParseUrl( $this->url );
+
+ if ( isset( $options['logger'] ) ) {
+ $this->logger = $options['logger'];
+ } else {
+ $this->logger = new NullLogger();
+ }
+
+ if ( !$this->parsedUrl || !Http::isValidURI( $this->url ) ) {
+ $this->status = Status::newFatal( 'http-invalid-url', $url );
+ } else {
+ $this->status = Status::newGood( 100 ); // continue
+ }
+
+ if ( isset( $options['timeout'] ) && $options['timeout'] != 'default' ) {
+ $this->timeout = $options['timeout'];
+ } else {
+ $this->timeout = $wgHTTPTimeout;
+ }
+ if ( isset( $options['connectTimeout'] ) && $options['connectTimeout'] != 'default' ) {
+ $this->connectTimeout = $options['connectTimeout'];
+ } else {
+ $this->connectTimeout = $wgHTTPConnectTimeout;
+ }
+ if ( isset( $options['userAgent'] ) ) {
+ $this->setUserAgent( $options['userAgent'] );
+ }
+
+ $members = [ "postData", "proxy", "noProxy", "sslVerifyHost", "caInfo",
+ "method", "followRedirects", "maxRedirects", "sslVerifyCert", "callback" ];
+
+ foreach ( $members as $o ) {
+ if ( isset( $options[$o] ) ) {
+ // ensure that MWHttpRequest::method is always
+ // uppercased. Bug 36137
+ if ( $o == 'method' ) {
+ $options[$o] = strtoupper( $options[$o] );
+ }
+ $this->$o = $options[$o];
+ }
+ }
+
+ if ( $this->noProxy ) {
+ $this->proxy = ''; // noProxy takes precedence
+ }
+
+ // Profile based on what's calling us
+ $this->profiler = $profiler;
+ $this->profileName = $caller;
+ }
+
+ /**
+ * @param LoggerInterface $logger
+ */
+ public function setLogger( LoggerInterface $logger ) {
+ $this->logger = $logger;
+ }
+
+ /**
+ * Simple function to test if we can make any sort of requests at all, using
+ * cURL or fopen()
+ * @return bool
+ */
+ public static function canMakeRequests() {
+ return function_exists( 'curl_init' ) || wfIniGetBool( 'allow_url_fopen' );
+ }
+
+ /**
+ * Generate a new request object
+ * @param string $url Url to use
+ * @param array $options (optional) extra params to pass (see Http::request())
+ * @param string $caller The method making this request, for profiling
+ * @throws MWException
+ * @return CurlHttpRequest|PhpHttpRequest
+ * @see MWHttpRequest::__construct
+ */
+ public static function factory( $url, $options = null, $caller = __METHOD__ ) {
+ if ( !Http::$httpEngine ) {
+ Http::$httpEngine = function_exists( 'curl_init' ) ? 'curl' : 'php';
+ } elseif ( Http::$httpEngine == 'curl' && !function_exists( 'curl_init' ) ) {
+ throw new MWException( __METHOD__ . ': curl (http://php.net/curl) is not installed, but' .
+ ' Http::$httpEngine is set to "curl"' );
+ }
+
+ if ( !is_array( $options ) ) {
+ $options = [];
+ }
+
+ if ( !isset( $options['logger'] ) ) {
+ $options['logger'] = LoggerFactory::getInstance( 'http' );
+ }
+
+ switch ( Http::$httpEngine ) {
+ case 'curl':
+ return new CurlHttpRequest( $url, $options, $caller, Profiler::instance() );
+ case 'php':
+ if ( !wfIniGetBool( 'allow_url_fopen' ) ) {
+ throw new MWException( __METHOD__ . ': allow_url_fopen ' .
+ 'needs to be enabled for pure PHP http requests to ' .
+ 'work. If possible, curl should be used instead. See ' .
+ 'http://php.net/curl.'
+ );
+ }
+ return new PhpHttpRequest( $url, $options, $caller, Profiler::instance() );
+ default:
+ throw new MWException( __METHOD__ . ': The setting of Http::$httpEngine is not valid.' );
+ }
+ }
+
+ /**
+ * Get the body, or content, of the response to the request
+ *
+ * @return string
+ */
+ public function getContent() {
+ return $this->content;
+ }
+
+ /**
+ * Set the parameters of the request
+ *
+ * @param array $args
+ * @todo overload the args param
+ */
+ public function setData( $args ) {
+ $this->postData = $args;
+ }
+
+ /**
+ * Take care of setting up the proxy (do nothing if "noProxy" is set)
+ *
+ * @return void
+ */
+ public function proxySetup() {
+ // If there is an explicit proxy set and proxies are not disabled, then use it
+ if ( $this->proxy && !$this->noProxy ) {
+ return;
+ }
+
+ // Otherwise, fallback to $wgHTTPProxy if this is not a machine
+ // local URL and proxies are not disabled
+ if ( self::isLocalURL( $this->url ) || $this->noProxy ) {
+ $this->proxy = '';
+ } else {
+ $this->proxy = Http::getProxy();
+ }
+ }
+
+ /**
+ * Check if the URL can be served by localhost
+ *
+ * @param string $url Full url to check
+ * @return bool
+ */
+ private static function isLocalURL( $url ) {
+ global $wgCommandLineMode, $wgLocalVirtualHosts;
+
+ if ( $wgCommandLineMode ) {
+ return false;
+ }
+
+ // Extract host part
+ $matches = [];
+ if ( preg_match( '!^https?://([\w.-]+)[/:].*$!', $url, $matches ) ) {
+ $host = $matches[1];
+ // Split up dotwise
+ $domainParts = explode( '.', $host );
+ // Check if this domain or any superdomain is listed as a local virtual host
+ $domainParts = array_reverse( $domainParts );
+
+ $domain = '';
+ $countParts = count( $domainParts );
+ for ( $i = 0; $i < $countParts; $i++ ) {
+ $domainPart = $domainParts[$i];
+ if ( $i == 0 ) {
+ $domain = $domainPart;
+ } else {
+ $domain = $domainPart . '.' . $domain;
+ }
+
+ if ( in_array( $domain, $wgLocalVirtualHosts ) ) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Set the user agent
+ * @param string $UA
+ */
+ public function setUserAgent( $UA ) {
+ $this->setHeader( 'User-Agent', $UA );
+ }
+
+ /**
+ * Set an arbitrary header
+ * @param string $name
+ * @param string $value
+ */
+ public function setHeader( $name, $value ) {
+ // I feel like I should normalize the case here...
+ $this->reqHeaders[$name] = $value;
+ }
+
+ /**
+ * Get an array of the headers
+ * @return array
+ */
+ public function getHeaderList() {
+ $list = [];
+
+ if ( $this->cookieJar ) {
+ $this->reqHeaders['Cookie'] =
+ $this->cookieJar->serializeToHttpRequest(
+ $this->parsedUrl['path'],
+ $this->parsedUrl['host']
+ );
+ }
+
+ foreach ( $this->reqHeaders as $name => $value ) {
+ $list[] = "$name: $value";
+ }
+
+ return $list;
+ }
+
+ /**
+ * Set a read callback to accept data read from the HTTP request.
+ * By default, data is appended to an internal buffer which can be
+ * retrieved through $req->getContent().
+ *
+ * To handle data as it comes in -- especially for large files that
+ * would not fit in memory -- you can instead set your own callback,
+ * in the form function($resource, $buffer) where the first parameter
+ * is the low-level resource being read (implementation specific),
+ * and the second parameter is the data buffer.
+ *
+ * You MUST return the number of bytes handled in the buffer; if fewer
+ * bytes are reported handled than were passed to you, the HTTP fetch
+ * will be aborted.
+ *
+ * @param callable $callback
+ * @throws MWException
+ */
+ public function setCallback( $callback ) {
+ if ( !is_callable( $callback ) ) {
+ throw new MWException( 'Invalid MwHttpRequest callback' );
+ }
+ $this->callback = $callback;
+ }
+
+ /**
+ * A generic callback to read the body of the response from a remote
+ * server.
+ *
+ * @param resource $fh
+ * @param string $content
+ * @return int
+ */
+ public function read( $fh, $content ) {
+ $this->content .= $content;
+ return strlen( $content );
+ }
+
+ /**
+ * Take care of whatever is necessary to perform the URI request.
+ *
+ * @return Status
+ */
+ public function execute() {
+
+ $this->content = "";
+
+ if ( strtoupper( $this->method ) == "HEAD" ) {
+ $this->headersOnly = true;
+ }
+
+ $this->proxySetup(); // set up any proxy as needed
+
+ if ( !$this->callback ) {
+ $this->setCallback( [ $this, 'read' ] );
+ }
+
+ if ( !isset( $this->reqHeaders['User-Agent'] ) ) {
+ $this->setUserAgent( Http::userAgent() );
+ }
+
+ }
+
+ /**
+ * Parses the headers, including the HTTP status code and any
+ * Set-Cookie headers. This function expects the headers to be
+ * found in an array in the member variable headerList.
+ */
+ protected function parseHeader() {
+
+ $lastname = "";
+
+ foreach ( $this->headerList as $header ) {
+ if ( preg_match( "#^HTTP/([0-9.]+) (.*)#", $header, $match ) ) {
+ $this->respVersion = $match[1];
+ $this->respStatus = $match[2];
+ } elseif ( preg_match( "#^[ \t]#", $header ) ) {
+ $last = count( $this->respHeaders[$lastname] ) - 1;
+ $this->respHeaders[$lastname][$last] .= "\r\n$header";
+ } elseif ( preg_match( "#^([^:]*):[\t ]*(.*)#", $header, $match ) ) {
+ $this->respHeaders[strtolower( $match[1] )][] = $match[2];
+ $lastname = strtolower( $match[1] );
+ }
+ }
+
+ $this->parseCookies();
+
+ }
+
+ /**
+ * Sets HTTPRequest status member to a fatal value with the error
+ * message if the returned integer value of the status code was
+ * not successful (< 300) or a redirect (>=300 and < 400). (see
+ * RFC2616, section 10,
+ * http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html for a
+ * list of status codes.)
+ */
+ protected function setStatus() {
+ if ( !$this->respHeaders ) {
+ $this->parseHeader();
+ }
+
+ if ( (int)$this->respStatus > 399 ) {
+ list( $code, $message ) = explode( " ", $this->respStatus, 2 );
+ $this->status->fatal( "http-bad-status", $code, $message );
+ }
+ }
+
+ /**
+ * Get the integer value of the HTTP status code (e.g. 200 for "200 Ok")
+ * (see RFC2616, section 10, http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+ * for a list of status codes.)
+ *
+ * @return int
+ */
+ public function getStatus() {
+ if ( !$this->respHeaders ) {
+ $this->parseHeader();
+ }
+
+ return (int)$this->respStatus;
+ }
+
+ /**
+ * Returns true if the last status code was a redirect.
+ *
+ * @return bool
+ */
+ public function isRedirect() {
+ if ( !$this->respHeaders ) {
+ $this->parseHeader();
+ }
+
+ $status = (int)$this->respStatus;
+
+ if ( $status >= 300 && $status <= 303 ) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Returns an associative array of response headers after the
+ * request has been executed. Because some headers
+ * (e.g. Set-Cookie) can appear more than once the, each value of
+ * the associative array is an array of the values given.
+ *
+ * @return array
+ */
+ public function getResponseHeaders() {
+ if ( !$this->respHeaders ) {
+ $this->parseHeader();
+ }
+
+ return $this->respHeaders;
+ }
+
+ /**
+ * Returns the value of the given response header.
+ *
+ * @param string $header
+ * @return string|null
+ */
+ public function getResponseHeader( $header ) {
+ if ( !$this->respHeaders ) {
+ $this->parseHeader();
+ }
+
+ if ( isset( $this->respHeaders[strtolower( $header )] ) ) {
+ $v = $this->respHeaders[strtolower( $header )];
+ return $v[count( $v ) - 1];
+ }
+
+ return null;
+ }
+
+ /**
+ * Tells the MWHttpRequest object to use this pre-loaded CookieJar.
+ *
+ * @param CookieJar $jar
+ */
+ public function setCookieJar( $jar ) {
+ $this->cookieJar = $jar;
+ }
+
+ /**
+ * Returns the cookie jar in use.
+ *
+ * @return CookieJar
+ */
+ public function getCookieJar() {
+ if ( !$this->respHeaders ) {
+ $this->parseHeader();
+ }
+
+ return $this->cookieJar;
+ }
+
+ /**
+ * Sets a cookie. Used before a request to set up any individual
+ * cookies. Used internally after a request to parse the
+ * Set-Cookie headers.
+ * @see Cookie::set
+ * @param string $name
+ * @param mixed $value
+ * @param array $attr
+ */
+ public function setCookie( $name, $value = null, $attr = null ) {
+ if ( !$this->cookieJar ) {
+ $this->cookieJar = new CookieJar;
+ }
+
+ $this->cookieJar->setCookie( $name, $value, $attr );
+ }
+
+ /**
+ * Parse the cookies in the response headers and store them in the cookie jar.
+ */
+ protected function parseCookies() {
+
+ if ( !$this->cookieJar ) {
+ $this->cookieJar = new CookieJar;
+ }
+
+ if ( isset( $this->respHeaders['set-cookie'] ) ) {
+ $url = parse_url( $this->getFinalUrl() );
+ foreach ( $this->respHeaders['set-cookie'] as $cookie ) {
+ $this->cookieJar->parseCookieResponseHeader( $cookie, $url['host'] );
+ }
+ }
+
+ }
+
+ /**
+ * Returns the final URL after all redirections.
+ *
+ * Relative values of the "Location" header are incorrect as
+ * stated in RFC, however they do happen and modern browsers
+ * support them. This function loops backwards through all
+ * locations in order to build the proper absolute URI - Marooned
+ * at wikia-inc.com
+ *
+ * Note that the multiple Location: headers are an artifact of
+ * CURL -- they shouldn't actually get returned this way. Rewrite
+ * this when bug 29232 is taken care of (high-level redirect
+ * handling rewrite).
+ *
+ * @return string
+ */
+ public function getFinalUrl() {
+ $headers = $this->getResponseHeaders();
+
+ // return full url (fix for incorrect but handled relative location)
+ if ( isset( $headers['location'] ) ) {
+ $locations = $headers['location'];
+ $domain = '';
+ $foundRelativeURI = false;
+ $countLocations = count( $locations );
+
+ for ( $i = $countLocations - 1; $i >= 0; $i-- ) {
+ $url = parse_url( $locations[$i] );
+
+ if ( isset( $url['host'] ) ) {
+ $domain = $url['scheme'] . '://' . $url['host'];
+ break; // found correct URI (with host)
+ } else {
+ $foundRelativeURI = true;
+ }
+ }
+
+ if ( $foundRelativeURI ) {
+ if ( $domain ) {
+ return $domain . $locations[$countLocations - 1];
+ } else {
+ $url = parse_url( $this->url );
+ if ( isset( $url['host'] ) ) {
+ return $url['scheme'] . '://' . $url['host'] .
+ $locations[$countLocations - 1];
+ }
+ }
+ } else {
+ return $locations[$countLocations - 1];
+ }
+ }
+
+ return $this->url;
+ }
+
+ /**
+ * Returns true if the backend can follow redirects. Overridden by the
+ * child classes.
+ * @return bool
+ */
+ public function canFollowRedirects() {
+ return true;
+ }
+}
--- /dev/null
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+class PhpHttpRequest extends MWHttpRequest {
+
+ private $fopenErrors = [];
+
+ /**
+ * @param string $url
+ * @return string
+ */
+ protected function urlToTcp( $url ) {
+ $parsedUrl = parse_url( $url );
+
+ return 'tcp://' . $parsedUrl['host'] . ':' . $parsedUrl['port'];
+ }
+
+ /**
+ * Returns an array with a 'capath' or 'cafile' key
+ * that is suitable to be merged into the 'ssl' sub-array of
+ * a stream context options array.
+ * Uses the 'caInfo' option of the class if it is provided, otherwise uses the system
+ * default CA bundle if PHP supports that, or searches a few standard locations.
+ * @return array
+ * @throws DomainException
+ */
+ protected function getCertOptions() {
+ $certOptions = [];
+ $certLocations = [];
+ if ( $this->caInfo ) {
+ $certLocations = [ 'manual' => $this->caInfo ];
+ } elseif ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
+ // @codingStandardsIgnoreStart Generic.Files.LineLength
+ // Default locations, based on
+ // https://www.happyassassin.net/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
+ // PHP 5.5 and older doesn't have any defaults, so we try to guess ourselves.
+ // PHP 5.6+ gets the CA location from OpenSSL as long as it is not set manually,
+ // so we should leave capath/cafile empty there.
+ // @codingStandardsIgnoreEnd
+ $certLocations = array_filter( [
+ getenv( 'SSL_CERT_DIR' ),
+ getenv( 'SSL_CERT_PATH' ),
+ '/etc/pki/tls/certs/ca-bundle.crt', # Fedora et al
+ '/etc/ssl/certs', # Debian et al
+ '/etc/pki/tls/certs/ca-bundle.trust.crt',
+ '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem',
+ '/System/Library/OpenSSL', # OSX
+ ] );
+ }
+
+ foreach ( $certLocations as $key => $cert ) {
+ if ( is_dir( $cert ) ) {
+ $certOptions['capath'] = $cert;
+ break;
+ } elseif ( is_file( $cert ) ) {
+ $certOptions['cafile'] = $cert;
+ break;
+ } elseif ( $key === 'manual' ) {
+ // fail more loudly if a cert path was manually configured and it is not valid
+ throw new DomainException( "Invalid CA info passed: $cert" );
+ }
+ }
+
+ return $certOptions;
+ }
+
+ /**
+ * Custom error handler for dealing with fopen() errors.
+ * fopen() tends to fire multiple errors in succession, and the last one
+ * is completely useless (something like "fopen: failed to open stream")
+ * so normal methods of handling errors programmatically
+ * like get_last_error() don't work.
+ */
+ public function errorHandler( $errno, $errstr ) {
+ $n = count( $this->fopenErrors ) + 1;
+ $this->fopenErrors += [ "errno$n" => $errno, "errstr$n" => $errstr ];
+ }
+
+ public function execute() {
+
+ parent::execute();
+
+ if ( is_array( $this->postData ) ) {
+ $this->postData = wfArrayToCgi( $this->postData );
+ }
+
+ if ( $this->parsedUrl['scheme'] != 'http'
+ && $this->parsedUrl['scheme'] != 'https' ) {
+ $this->status->fatal( 'http-invalid-scheme', $this->parsedUrl['scheme'] );
+ }
+
+ $this->reqHeaders['Accept'] = "*/*";
+ $this->reqHeaders['Connection'] = 'Close';
+ if ( $this->method == 'POST' ) {
+ // Required for HTTP 1.0 POSTs
+ $this->reqHeaders['Content-Length'] = strlen( $this->postData );
+ if ( !isset( $this->reqHeaders['Content-Type'] ) ) {
+ $this->reqHeaders['Content-Type'] = "application/x-www-form-urlencoded";
+ }
+ }
+
+ // Set up PHP stream context
+ $options = [
+ 'http' => [
+ 'method' => $this->method,
+ 'header' => implode( "\r\n", $this->getHeaderList() ),
+ 'protocol_version' => '1.1',
+ 'max_redirects' => $this->followRedirects ? $this->maxRedirects : 0,
+ 'ignore_errors' => true,
+ 'timeout' => $this->timeout,
+ // Curl options in case curlwrappers are installed
+ 'curl_verify_ssl_host' => $this->sslVerifyHost ? 2 : 0,
+ 'curl_verify_ssl_peer' => $this->sslVerifyCert,
+ ],
+ 'ssl' => [
+ 'verify_peer' => $this->sslVerifyCert,
+ 'SNI_enabled' => true,
+ 'ciphers' => 'HIGH:!SSLv2:!SSLv3:-ADH:-kDH:-kECDH:-DSS',
+ 'disable_compression' => true,
+ ],
+ ];
+
+ if ( $this->proxy ) {
+ $options['http']['proxy'] = $this->urlToTcp( $this->proxy );
+ $options['http']['request_fulluri'] = true;
+ }
+
+ if ( $this->postData ) {
+ $options['http']['content'] = $this->postData;
+ }
+
+ if ( $this->sslVerifyHost ) {
+ // PHP 5.6.0 deprecates CN_match, in favour of peer_name which
+ // actually checks SubjectAltName properly.
+ if ( version_compare( PHP_VERSION, '5.6.0', '>=' ) ) {
+ $options['ssl']['peer_name'] = $this->parsedUrl['host'];
+ } else {
+ $options['ssl']['CN_match'] = $this->parsedUrl['host'];
+ }
+ }
+
+ $options['ssl'] += $this->getCertOptions();
+
+ $context = stream_context_create( $options );
+
+ $this->headerList = [];
+ $reqCount = 0;
+ $url = $this->url;
+
+ $result = [];
+
+ if ( $this->profiler ) {
+ $profileSection = $this->profiler->scopedProfileIn(
+ __METHOD__ . '-' . $this->profileName
+ );
+ }
+ do {
+ $reqCount++;
+ $this->fopenErrors = [];
+ set_error_handler( [ $this, 'errorHandler' ] );
+ $fh = fopen( $url, "r", false, $context );
+ restore_error_handler();
+
+ if ( !$fh ) {
+ // HACK for instant commons.
+ // If we are contacting (commons|upload).wikimedia.org
+ // try again with CN_match for en.wikipedia.org
+ // as php does not handle SubjectAltName properly
+ // prior to "peer_name" option in php 5.6
+ if ( isset( $options['ssl']['CN_match'] )
+ && ( $options['ssl']['CN_match'] === 'commons.wikimedia.org'
+ || $options['ssl']['CN_match'] === 'upload.wikimedia.org' )
+ ) {
+ $options['ssl']['CN_match'] = 'en.wikipedia.org';
+ $context = stream_context_create( $options );
+ continue;
+ }
+ break;
+ }
+
+ $result = stream_get_meta_data( $fh );
+ $this->headerList = $result['wrapper_data'];
+ $this->parseHeader();
+
+ if ( !$this->followRedirects ) {
+ break;
+ }
+
+ # Handle manual redirection
+ if ( !$this->isRedirect() || $reqCount > $this->maxRedirects ) {
+ break;
+ }
+ # Check security of URL
+ $url = $this->getResponseHeader( "Location" );
+
+ if ( !Http::isValidURI( $url ) ) {
+ $this->logger->debug( __METHOD__ . ": insecure redirection\n" );
+ break;
+ }
+ } while ( true );
+ if ( $this->profiler ) {
+ $this->profiler->scopedProfileOut( $profileSection );
+ }
+
+ $this->setStatus();
+
+ if ( $fh === false ) {
+ if ( $this->fopenErrors ) {
+ $this->logger->warning( __CLASS__
+ . ': error opening connection: {errstr1}', $this->fopenErrors );
+ }
+ $this->status->fatal( 'http-request-error' );
+ return $this->status;
+ }
+
+ if ( $result['timed_out'] ) {
+ $this->status->fatal( 'http-timed-out', $this->url );
+ return $this->status;
+ }
+
+ // If everything went OK, or we received some error code
+ // get the response body content.
+ if ( $this->status->isOK() || (int)$this->respStatus >= 300 ) {
+ while ( !feof( $fh ) ) {
+ $buf = fread( $fh, 8192 );
+
+ if ( $buf === false ) {
+ $this->status->fatal( 'http-read-error' );
+ break;
+ }
+
+ if ( strlen( $buf ) ) {
+ call_user_func( $this->callback, $fh, $buf );
+ }
+ }
+ }
+ fclose( $fh );
+
+ return $this->status;
+ }
+}
// 1.28
[ 'addIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp',
'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
+ [ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ],
+ [ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ],
];
}
'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
[ 'doRevisionPageRevIndexNonUnique' ],
[ 'doNonUniquePlTlIl' ],
+ [ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ],
+ [ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ],
];
}
// 1.28
[ 'addIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp',
'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
+ [ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ],
+ [ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ],
// KEEP THIS AT THE BOTTOM!!
[ 'doRebuildDuplicateFunction' ],
[ 'addSequence', 'archive', false, 'archive_ar_id_seq' ],
[ 'addSequence', 'externallinks', false, 'externallinks_el_id_seq' ],
[ 'addSequence', 'watchlist', false, 'watchlist_wl_id_seq' ],
+ [ 'addSequence', 'change_tag', false, 'change_tag_ct_id_seq' ],
+ [ 'addSequence', 'tag_summary', false, 'tag_summary_ts_id_seq' ],
# new tables
[ 'addTable', 'category', 'patch-category.sql' ],
// 1.28
[ 'addPgIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp',
'( rc_namespace, rc_type, rc_patrolled, rc_timestamp )' ],
+ [ 'addPgField', 'change_tag', 'ct_id',
+ "INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('change_tag_ct_id_seq')" ],
+ [ 'addPgField', 'tag_summary', 'ts_id',
+ "INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('tag_summary_ts_id_seq')" ],
];
}
// 1.28
[ 'addIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp',
'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
+ [ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ],
+ [ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ],
];
}
unset( $req ); // don't assign over this by accident
$indexes = array_keys( $reqs );
- if ( function_exists( 'curl_multi_setopt' ) ) { // PHP 5.5
- if ( isset( $opts['usePipelining'] ) ) {
- curl_multi_setopt( $chm, CURLMOPT_PIPELINING, (int)$opts['usePipelining'] );
- }
- if ( isset( $opts['maxConnsPerHost'] ) ) {
- // Keep these sockets around as they may be needed later in the request
- curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, (int)$opts['maxConnsPerHost'] );
- }
+ if ( isset( $opts['usePipelining'] ) ) {
+ curl_multi_setopt( $chm, CURLMOPT_PIPELINING, (int)$opts['usePipelining'] );
+ }
+ if ( isset( $opts['maxConnsPerHost'] ) ) {
+ // Keep these sockets around as they may be needed later in the request
+ curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, (int)$opts['maxConnsPerHost'] );
}
// @TODO: use a per-host rolling handle window (e.g. CURLMOPT_MAX_HOST_CONNECTIONS)
unset( $req ); // don't assign over this by accident
// Restore the default settings
- if ( function_exists( 'curl_multi_setopt' ) ) { // PHP 5.5
- curl_multi_setopt( $chm, CURLMOPT_PIPELINING, (int)$this->usePipelining );
- curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, (int)$this->maxConnsPerHost );
- }
+ curl_multi_setopt( $chm, CURLMOPT_PIPELINING, (int)$this->usePipelining );
+ curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, (int)$this->maxConnsPerHost );
return $reqs;
}
curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
$url = $req['url'];
- // PHP_QUERY_RFC3986 is PHP 5.4+ only
- $query = str_replace(
- [ '+', '%7E' ],
- [ '%20', '~' ],
- http_build_query( $req['query'], '', '&' )
- );
+ $query = http_build_query( $req['query'], '', '&', PHP_QUERY_RFC3986 );
if ( $query != '' ) {
$url .= strpos( $req['url'], '?' ) === false ? "?$query" : "&$query";
}
protected function getCurlMulti() {
if ( !$this->multiHandle ) {
$cmh = curl_multi_init();
- if ( function_exists( 'curl_multi_setopt' ) ) { // PHP 5.5
- curl_multi_setopt( $cmh, CURLMOPT_PIPELINING, (int)$this->usePipelining );
- curl_multi_setopt( $cmh, CURLMOPT_MAXCONNECTS, (int)$this->maxConnsPerHost );
- }
+ curl_multi_setopt( $cmh, CURLMOPT_PIPELINING, (int)$this->usePipelining );
+ curl_multi_setopt( $cmh, CURLMOPT_MAXCONNECTS, (int)$this->maxConnsPerHost );
$this->multiHandle = $cmh;
}
return $this->multiHandle;
public function sourceFile(
$filename,
- $lineCallback = false,
- $resultCallback = false,
+ callable $lineCallback = null,
+ callable $resultCallback = null,
$fname = false,
- $inputCallback = false
+ callable $inputCallback = null
) {
MediaWiki\suppressWarnings();
$fp = fopen( $filename, 'r' );
public function sourceStream(
$fp,
- $lineCallback = false,
- $resultCallback = false,
+ callable $lineCallback = null,
+ callable $resultCallback = null,
$fname = __METHOD__,
- $inputCallback = false
+ callable $inputCallback = null
) {
$cmd = '';
* on object's error ignore settings).
*
* @param string $filename File name to open
- * @param bool|callable $lineCallback Optional function called before reading each line
- * @param bool|callable $resultCallback Optional function called for each MySQL result
+ * @param callable|null $lineCallback Optional function called before reading each line
+ * @param callable|null $resultCallback Optional function called for each MySQL result
* @param bool|string $fname Calling function name or false if name should be
* generated dynamically using $filename
- * @param bool|callable $inputCallback Optional function called for each
+ * @param callable|null $inputCallback Optional function called for each
* complete line sent
* @return bool|string
* @throws Exception
*/
public function sourceFile(
$filename,
- $lineCallback = false,
- $resultCallback = false,
+ callable $lineCallback = null,
+ callable $resultCallback = null,
$fname = false,
- $inputCallback = false
+ callable $inputCallback = null
);
/**
* on object's error ignore settings).
*
* @param resource $fp File handle
- * @param bool|callable $lineCallback Optional function called before reading each query
- * @param bool|callable $resultCallback Optional function called for each MySQL result
+ * @param callable|null $lineCallback Optional function called before reading each query
+ * @param callable|null $resultCallback Optional function called for each MySQL result
* @param string $fname Calling function name
- * @param bool|callable $inputCallback Optional function called for each complete query sent
+ * @param callable|null $inputCallback Optional function called for each complete query sent
* @return bool|string
*/
public function sourceStream(
$fp,
- $lineCallback = false,
- $resultCallback = false,
+ callable $lineCallback = null,
+ callable $resultCallback = null,
$fname = __METHOD__,
- $inputCallback = false
+ callable $inputCallback = null
);
/**
private $extLBs = [];
/** @var string */
- private $loadMonitorClass;
+ private $loadMonitorClass = 'LoadMonitor';
/** @var string */
private $lastDomain;
$this->baseLoadBalancerParams(),
[
'servers' => $this->makeServerArray( $template, $loads, $groupLoads ),
- 'loadMonitor' => $this->loadMonitorClass,
+ 'loadMonitor' => [ 'class' => $this->loadMonitorClass ],
'readOnlyReason' => $readOnlyReason
]
) );
: [];
$this->loadMonitorClass = isset( $conf['loadMonitorClass'] )
? $conf['loadMonitorClass']
- : null;
+ : 'LoadMonitor';
}
/**
$this->baseLoadBalancerParams(),
[
'servers' => $servers,
- 'loadMonitor' => $this->loadMonitorClass,
+ 'loadMonitor' => [ 'class' => $this->loadMonitorClass ],
]
) );
$this->initLoadBalancer( $lb );
private $mServers;
/** @var array[] Map of (local/foreignUsed/foreignFree => server index => IDatabase array) */
private $mConns;
- /** @var array Map of (server index => weight) */
+ /** @var float[] Map of (server index => weight) */
private $mLoads;
/** @var array[] Map of (group => server index => weight) */
private $mGroupLoads;
private $mAllowLagged;
/** @var integer Seconds to spend waiting on replica DB lag to resolve */
private $mWaitTimeout;
- /** @var string The LoadMonitor subclass name */
- private $mLoadMonitorClass;
+ /** @var array The LoadMonitor configuration */
+ private $loadMonitorConfig;
/** @var array[] $aliases Map of (table => (dbname, schema, prefix) map) */
private $tableAliases = [];
/** @var ILoadMonitor */
- private $mLoadMonitor;
+ private $loadMonitor;
/** @var BagOStuff */
private $srvCache;
/** @var BagOStuff */
}
if ( isset( $params['loadMonitor'] ) ) {
- $this->mLoadMonitorClass = $params['loadMonitor'];
+ $this->loadMonitorConfig = $params['loadMonitor'];
} else {
- $master = reset( $params['servers'] );
- if ( isset( $master['type'] ) && $master['type'] === 'mysql' ) {
- $this->mLoadMonitorClass = 'LoadMonitorMySQL';
- } else {
- $this->mLoadMonitorClass = 'LoadMonitorNull';
- }
+ $this->loadMonitorConfig = [ 'class' => 'LoadMonitorNull' ];
}
foreach ( $params['servers'] as $i => $server ) {
* @return ILoadMonitor
*/
private function getLoadMonitor() {
- if ( !isset( $this->mLoadMonitor ) ) {
- $class = $this->mLoadMonitorClass;
- $this->mLoadMonitor = new $class( $this, $this->srvCache, $this->memCache );
- $this->mLoadMonitor->setLogger( $this->replLogger );
+ if ( !isset( $this->loadMonitor ) ) {
+ $class = $this->loadMonitorConfig['class'];
+ $this->loadMonitor = new $class(
+ $this, $this->srvCache, $this->memCache, $this->loadMonitorConfig );
+ $this->loadMonitor->setLogger( $this->replLogger );
}
- return $this->mLoadMonitor;
+ return $this->loadMonitor;
}
/**
* @param ILoadBalancer $lb LoadBalancer this instance serves
* @param BagOStuff $sCache Local server memory cache
* @param BagOStuff $cCache Local cluster memory cache
+ * @param array $options Options map
*/
- public function __construct( ILoadBalancer $lb, BagOStuff $sCache, BagOStuff $cCache );
+ public function __construct(
+ ILoadBalancer $lb, BagOStuff $sCache, BagOStuff $cCache, array $options = []
+ );
/**
* Perform pre-connection load ratio adjustment.
- * @param int[] &$loads
+ * @param int[] &$weightByServer Map of (server index => integer weight)
* @param string|bool $group The selected query group. Default: false
* @param string|bool $domain Default: false
*/
- public function scaleLoads( &$loads, $group = false, $domain = false );
+ public function scaleLoads( array &$weightByServer, $group = false, $domain = false );
/**
* Get an estimate of replication lag (in seconds) for each server
*
* @return array Map of (server index => float|int|bool)
*/
- public function getLagTimes( $serverIndexes, $domain );
+ public function getLagTimes( array $serverIndexes, $domain );
/**
* Clear any process and persistent cache of lag times
/** @var LoggerInterface */
protected $replLogger;
- public function __construct( ILoadBalancer $lb, BagOStuff $srvCache, BagOStuff $cache ) {
+ /** @var float Moving average ratio (e.g. 0.1 for 10% weight to new weight) */
+ private $movingAveRatio;
+
+ public function __construct(
+ ILoadBalancer $lb, BagOStuff $srvCache, BagOStuff $cache, array $options = []
+ ) {
$this->parent = $lb;
$this->srvCache = $srvCache;
$this->mainCache = $cache;
$this->replLogger = new \Psr\Log\NullLogger();
+
+ $this->movingAveRatio = isset( $options['movingAveRatio'] )
+ ? $options['movingAveRatio']
+ : 0.1;
}
public function setLogger( LoggerInterface $logger ) {
$this->replLogger = $logger;
}
- public function scaleLoads( &$loads, $group = false, $domain = false ) {
+ public function scaleLoads( array &$weightByServer, $group = false, $domain = false ) {
+ $states = $this->getServerStates( $weightByServer, $domain );
+ $coefficientsByServer = $states['weightScales'];
+ foreach ( $weightByServer as $i => $weight ) {
+ $weightByServer[$i] = $weight * $coefficientsByServer[$i];
+ }
+ }
+
+ public function getLagTimes( array $serverIndexes, $domain ) {
+ $states = $this->getServerStates( $serverIndexes, $domain );
+
+ return $states['lagTimes'];
}
- public function getLagTimes( $serverIndexes, $domain ) {
+ protected function getServerStates( array $serverIndexes, $domain ) {
if ( count( $serverIndexes ) == 1 && reset( $serverIndexes ) == 0 ) {
# Single server only, just return zero without caching
- return [ 0 => 0 ];
+ return [
+ 'lagTimes' => [ $this->parent->getWriterIndex() => 0 ],
+ 'weightScales' => [ $this->parent->getWriterIndex() => 1 ]
+ ];
}
- $key = $this->getLagTimeCacheKey();
+ $key = $this->getCacheKey();
# Randomize TTLs to reduce stampedes (4.0 - 5.0 sec)
$ttl = mt_rand( 4e6, 5e6 ) / 1e6;
# Keep keys around longer as fallbacks
$value = $this->srvCache->get( $key );
if ( $value && $value['timestamp'] > ( microtime( true ) - $ttl ) ) {
$this->replLogger->debug( __METHOD__ . ": got lag times ($key) from local cache" );
- return $value['lagTimes']; // cache hit
+ return $value; // cache hit
}
$staleValue = $value ?: false;
$this->srvCache->set( $key, $value, $staleTTL );
$this->replLogger->debug( __METHOD__ . ": got lag times ($key) from main cache" );
- return $value['lagTimes']; // cache hit
+ return $value; // cache hit
}
$staleValue = $value ?: $staleValue;
} );
} elseif ( $staleValue ) {
# Could not acquire lock but an old cache exists, so use it
- return $staleValue['lagTimes'];
+ return $staleValue;
}
$lagTimes = [];
+ $weightScales = [];
+ $movAveRatio = $this->movingAveRatio;
foreach ( $serverIndexes as $i ) {
if ( $i == $this->parent->getWriterIndex() ) {
$lagTimes[$i] = 0; // master always has no lag
+ $weightScales[$i] = 1.0; // nominal weight
continue;
}
$close = true; // new connection
}
+ $lastWeight = isset( $staleValue['weightScales'][$i] )
+ ? $staleValue['weightScales'][$i]
+ : 1.0;
+ $coefficient = $this->getWeightScale( $i, $conn ?: null );
+ $newWeight = $movAveRatio * $coefficient + ( 1 - $movAveRatio ) * $lastWeight;
+
+ // Scale from 10% to 100% of nominal weight
+ $weightScales[$i] = max( $newWeight, .10 );
+
if ( !$conn ) {
$lagTimes[$i] = false;
$host = $this->parent->getServerName( $i );
- $this->replLogger->error( __METHOD__ . ": host $host (#$i) is unreachable" );
+ $this->replLogger->error( __METHOD__ . ": host $host is unreachable" );
continue;
}
$lagTimes[$i] = $conn->getLag();
if ( $lagTimes[$i] === false ) {
$host = $this->parent->getServerName( $i );
- $this->replLogger->error( __METHOD__ . ": host $host (#$i) is not replicating?" );
+ $this->replLogger->error( __METHOD__ . ": host $host is not replicating?" );
}
if ( $close ) {
}
# Add a timestamp key so we know when it was cached
- $value = [ 'lagTimes' => $lagTimes, 'timestamp' => microtime( true ) ];
+ $value = [
+ 'lagTimes' => $lagTimes,
+ 'weightScales' => $weightScales,
+ 'timestamp' => microtime( true )
+ ];
$this->mainCache->set( $key, $value, $staleTTL );
$this->srvCache->set( $key, $value, $staleTTL );
$this->replLogger->info( __METHOD__ . ": re-calculated lag times ($key)" );
- return $value['lagTimes'];
+ return $value;
+ }
+
+ /**
+ * @param integer $index Server index
+ * @param IDatabase|null $conn Connection handle or null on connection failure
+ * @return float
+ */
+ protected function getWeightScale( $index, IDatabase $conn = null ) {
+ return $conn ? 1.0 : 0.0;
}
public function clearCaches() {
- $key = $this->getLagTimeCacheKey();
+ $key = $this->getCacheKey();
$this->srvCache->delete( $key );
$this->mainCache->delete( $key );
}
- private function getLagTimeCacheKey() {
- $writerIndex = $this->parent->getWriterIndex();
+ private function getCacheKey() {
// Lag is per-server, not per-DB, so key on the master DB name
return $this->srvCache->makeGlobalKey(
'lag-times',
- $this->parent->getServerName( $writerIndex )
+ $this->parent->getServerName( $this->parent->getWriterIndex() )
);
}
}
* @ingroup Database
*/
class LoadMonitorMySQL extends LoadMonitor {
- public function scaleLoads( &$loads, $group = false, $domain = false ) {
- // @TODO: maybe use Threads_running/Threads_created ratio to guess load
- // and Queries/Uptime to guess if a server is warming up the buffer pool
+ /** @var float What buffer pool use ratio counts as "warm" (e.g. 0.5 for 50% usage) */
+ private $warmCacheRatio;
+
+ public function __construct(
+ ILoadBalancer $lb, BagOStuff $srvCache, BagOStuff $cache, array $options = []
+ ) {
+ parent::__construct( $lb, $srvCache, $cache, $options );
+
+ $this->warmCacheRatio = isset( $options['warmCacheRatio'] )
+ ? $options['warmCacheRatio']
+ : 0.0;
+ }
+
+ protected function getWeightScale( $index, IDatabase $conn = null ) {
+ if ( !$conn ) {
+ return 0.0;
+ }
+
+ $weight = 1.0;
+ if ( $this->warmCacheRatio > 0 ) {
+ $res = $conn->query( 'SHOW STATUS', false );
+ $s = $res ? $conn->fetchObject( $res ) : false;
+ if ( $s === false ) {
+ $host = $this->parent->getServerName( $index );
+ $this->replLogger->error( __METHOD__ . ": could not get status for $host" );
+ } else {
+ // http://dev.mysql.com/doc/refman/5.7/en/server-status-variables.html
+ if ( $s->Innodb_buffer_pool_pages_total > 0 ) {
+ $ratio = $s->Innodb_buffer_pool_pages_data / $s->Innodb_buffer_pool_pages_total;
+ } elseif ( $s->Qcache_total_blocks > 0 ) {
+ $ratio = 1.0 - $s->Qcache_free_blocks / $s->Qcache_total_blocks;
+ } else {
+ $ratio = 1.0;
+ }
+ // Stop caring once $ratio >= $this->warmCacheRatio
+ $weight *= min( $ratio / $this->warmCacheRatio, 1.0 );
+ }
+ }
+
+ return $weight;
}
}
use Psr\Log\LoggerInterface;
class LoadMonitorNull implements ILoadMonitor {
- public function __construct( ILoadBalancer $lb, BagOStuff $sCache, BagOStuff $cCache ) {
+ public function __construct(
+ ILoadBalancer $lb, BagOStuff $sCache, BagOStuff $cCache, array $options = []
+ ) {
}
public function setLogger( LoggerInterface $logger ) {
}
- public function scaleLoads( &$loads, $group = false, $domain = false ) {
+ public function scaleLoads( array &$loads, $group = false, $domain = false ) {
}
- public function getLagTimes( $serverIndexes, $domain ) {
+ public function getLagTimes( array $serverIndexes, $domain ) {
return array_fill_keys( $serverIndexes, 0 );
}
* @deprecated since 1.21, getContent() should be used instead.
*/
public function getText( $audience = Revision::FOR_PUBLIC, User $user = null ) {
- ContentHandler::deprecated( __METHOD__, '1.21' );
+ wfDeprecated( __METHOD__, '1.21' );
$this->loadLastEdit();
if ( $this->mLastRevision ) {
'text' => $ilLangName,
'title' => $ilTitle,
'class' => $class,
+ 'link-class' => 'interlanguage-link-target',
'lang' => $ilInterwikiCodeBCP47,
'hreflang' => $ilInterwikiCodeBCP47,
];
if ( !$title->equals( $oldTitle ) ) {
$oldTitleText = $oldTitle->getPrefixedText();
- $oldTitleText = $this->msg( 'rc-old-title' )->params( $oldTitleText )->escaped();
+ $oldTitleText = Html::rawElement(
+ 'span',
+ [ 'class' => 'mw-newpages-oldtitle' ],
+ $this->msg( 'rc-old-title' )->params( $oldTitleText )->escaped()
+ );
}
return "<li{$css}>{$time} {$dm}{$plink} {$hist} {$dm}{$length} "
"searchprofile-advanced-tooltip": "Search in custom namespaces",
"search-result-size": "$1 ({{PLURAL:$2|1 word|$2 words}})",
"search-result-category-size": "{{PLURAL:$1|1 member|$1 members}} ({{PLURAL:$2|1 subcategory|$2 subcategories}}, {{PLURAL:$3|1 file|$3 files}})",
- "search-redirect": "(redirect $1)",
+ "search-redirect": "(redirect from $1)",
"search-section": "(section $1)",
"search-category": "(category $1)",
"search-file-match": "(matches file content)",
"feedback-external-bug-report-button": "File a technical task",
"feedback-dialog-title": "Submit feedback",
"feedback-dialog-intro": "You can use the easy form below to submit your feedback. Your comment will be added to the page \"$1\", along with your username.",
- "feedback-error-title": "Error",
"feedback-error1": "Error: Unrecognized result from API",
"feedback-error2": "Error: Edit failed",
"feedback-error3": "Error: No response from API",
"feedback-external-bug-report-button": "A button for submitting an external technical bug report.",
"feedback-dialog-title": "Title of the feedback dialog",
"feedback-dialog-intro": "An introduction at the top of the feedback dialog. $1 - Feedback page link",
- "feedback-error-title": "{{Identical|Error}}",
"feedback-error1": "Error message, appears when an unknown error occurs submitting feedback",
"feedback-error2": "Error message, appears when we could not add feedback",
"feedback-error3": "Error message, appears when we lose our connection to the wiki",
--- /dev/null
+-- Primary key in change_tag table
+
+ALTER TABLE /*$wgDBprefix*/change_tag
+ ADD COLUMN ct_id INT UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
+ ADD PRIMARY KEY (ct_id);
--- /dev/null
+-- Primary key in tag_summary table
+
+ALTER TABLE /*$wgDBprefix*/tag_summary
+ ADD COLUMN ts_id INT UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
+ ADD PRIMARY KEY (ts_id);
cache|http://www.google.com/search?q=cache:$1|0|
commons|https://commons.wikimedia.org/wiki/$1|0|https://commons.wikimedia.org/w/api.php
dictionary|http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=$1|0|
-docbook|http://wiki.docbook.org/$1|0|
doi|http://dx.doi.org/$1|0|
drumcorpswiki|http://www.drumcorpswiki.com/$1|0|http://drumcorpswiki.com/api.php
dwjwiki|http://www.suberic.net/cgi-bin/dwj/wiki.cgi?$1|0|
foldoc|http://foldoc.org/?$1|0|
foxwiki|http://fox.wikis.com/wc.dll?Wiki~$1|0|
freebsdman|http://www.FreeBSD.org/cgi/man.cgi?apropos=1&query=$1|0|
-gej|http://www.esperanto.de/dej.malnova/aktivikio.pl?$1|0|
gentoo-wiki|http://gentoo-wiki.com/$1|0|
google|http://www.google.com/search?q=$1|0|
googlegroups|http://groups.google.com/groups?q=$1|0|
hammondwiki|http://www.dairiki.org/HammondWiki/$1|0|
hrwiki|http://www.hrwiki.org/wiki/$1|0|http://www.hrwiki.org/w/api.php
imdb|http://www.imdb.com/find?q=$1&tt=on|0|
-jargonfile|http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=$1|0|
kmwiki|http://kmwiki.wikispaces.com/$1|0|
linuxwiki|http://linuxwiki.de/$1|0|
lojban|http://mw.lojban.org/papri/$1|0|
lqwiki|http://wiki.linuxquestions.org/wiki/$1|0|
-lugkr|http://www.lug-kr.de/wiki/$1|0|
meatball|http://www.usemod.com/cgi-bin/mb.pl?$1|0|
mediawikiwiki|https://www.mediawiki.org/wiki/$1|0|https://www.mediawiki.org/w/api.php
-mediazilla|https://bugzilla.wikimedia.org/$1|0|
memoryalpha|http://en.memory-alpha.org/wiki/$1|0|http://en.memory-alpha.org/api.php
metawiki|http://sunir.org/apps/meta.pl?$1|0|
metawikimedia|https://meta.wikimedia.org/wiki/$1|0|https://meta.wikimedia.org/w/api.php
mw|https://www.mediawiki.org/wiki/$1|0|https://www.mediawiki.org/w/api.php
oeis|http://oeis.org/$1|0|
openwiki|http://openwiki.com/ow.asp?$1|0|
-ppr|http://c2.com/cgi/wiki?$1|0|
pythoninfo|http://wiki.python.org/moin/$1|0|
rfc|http://www.rfc-editor.org/rfc/rfc$1.txt|0|
s23wiki|http://s23.org/wiki/$1|0|http://s23.org/w/api.php
seattlewireless|http://seattlewireless.net/$1|0|
senseislibrary|http://senseis.xmp.net/?$1|0|
shoutwiki|http://www.shoutwiki.com/wiki/$1|0|http://www.shoutwiki.com/w/api.php
-sourcewatch|http://www.sourcewatch.org/index.php?title=$1|0|http://www.sourcewatch.org/api.php
squeak|http://wiki.squeak.org/squeak/$1|0|
-tejo|http://www.tejo.org/vikio/$1|0|
tmbw|http://www.tmbw.net/wiki/$1|0|http://tmbw.net/wiki/api.php
tmnet|http://www.technomanifestos.net/?$1|0|
theopedia|http://www.theopedia.com/$1|0|
twiki|http://twiki.org/cgi-bin/view/$1|0|
-uea|http://uea.org/vikio/index.php/$1|0|http://uea.org/vikio/api.php
uncyclopedia|http://en.uncyclopedia.co/wiki/$1|0|http://en.uncyclopedia.co/w/api.php
unreal|http://wiki.beyondunreal.com/$1|0|http://wiki.beyondunreal.com/w/api.php
usemod|http://www.usemod.com/cgi-bin/wiki.pl?$1|0|
-webseitzwiki|http://webseitz.fluxent.com/wiki/$1|0|
wiki|http://c2.com/cgi/wiki?$1|0|
wikia|http://www.wikia.com/wiki/$1|0|
wikibooks|https://en.wikibooks.org/wiki/$1|0|https://en.wikibooks.org/w/api.php
('cache','http://www.google.com/search?q=cache:$1',0,''),
('commons','https://commons.wikimedia.org/wiki/$1',0,'https://commons.wikimedia.org/w/api.php'),
('dictionary','http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=$1',0,''),
-('docbook','http://wiki.docbook.org/$1',0,''),
('doi','http://dx.doi.org/$1',0,''),
('drumcorpswiki','http://www.drumcorpswiki.com/$1',0,'http://drumcorpswiki.com/api.php'),
('dwjwiki','http://www.suberic.net/cgi-bin/dwj/wiki.cgi?$1',0,''),
('foldoc','http://foldoc.org/?$1',0,''),
('foxwiki','http://fox.wikis.com/wc.dll?Wiki~$1',0,''),
('freebsdman','http://www.FreeBSD.org/cgi/man.cgi?apropos=1&query=$1',0,''),
-('gej','http://www.esperanto.de/dej.malnova/aktivikio.pl?$1',0,''),
('gentoo-wiki','http://gentoo-wiki.com/$1',0,''),
('google','http://www.google.com/search?q=$1',0,''),
('googlegroups','http://groups.google.com/groups?q=$1',0,''),
('hammondwiki','http://www.dairiki.org/HammondWiki/$1',0,''),
('hrwiki','http://www.hrwiki.org/wiki/$1',0,'http://www.hrwiki.org/w/api.php'),
('imdb','http://www.imdb.com/find?q=$1&tt=on',0,''),
-('jargonfile','http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=$1',0,''),
('kmwiki','http://kmwiki.wikispaces.com/$1',0,''),
('linuxwiki','http://linuxwiki.de/$1',0,''),
('lojban','http://www.lojban.org/tiki/tiki-index.php?page=$1',0,''),
('lqwiki','http://wiki.linuxquestions.org/wiki/$1',0,''),
-('lugkr','http://www.lug-kr.de/wiki/$1',0,''),
('meatball','http://www.usemod.com/cgi-bin/mb.pl?$1',0,''),
('mediawikiwiki','https://www.mediawiki.org/wiki/$1',0,'https://www.mediawiki.org/w/api.php'),
-('mediazilla','https://bugzilla.wikimedia.org/$1',0,''),
('memoryalpha','http://en.memory-alpha.org/wiki/$1',0,'http://en.memory-alpha.org/api.php'),
('metawiki','http://sunir.org/apps/meta.pl?$1',0,''),
('metawikimedia','https://meta.wikimedia.org/wiki/$1',0,'https://meta.wikimedia.org/w/api.php'),
('mw','https://www.mediawiki.org/wiki/$1',0,'https://www.mediawiki.org/w/api.php'),
('oeis','http://oeis.org/$1',0,''),
('openwiki','http://openwiki.com/ow.asp?$1',0,''),
-('ppr','http://c2.com/cgi/wiki?$1',0,''),
('pythoninfo','http://wiki.python.org/moin/$1',0,''),
('rfc','http://www.rfc-editor.org/rfc/rfc$1.txt',0,''),
('s23wiki','http://s23.org/wiki/$1',0,'http://s23.org/w/api.php'),
('seattlewireless','http://seattlewireless.net/$1',0,''),
('senseislibrary','http://senseis.xmp.net/?$1',0,''),
('shoutwiki','http://www.shoutwiki.com/wiki/$1',0,'http://www.shoutwiki.com/w/api.php'),
-('sourcewatch','http://www.sourcewatch.org/index.php?title=$1',0,'http://www.sourcewatch.org/api.php'),
('squeak','http://wiki.squeak.org/squeak/$1',0,''),
-('tejo','http://www.tejo.org/vikio/$1',0,''),
('tmbw','http://www.tmbw.net/wiki/$1',0,'http://tmbw.net/wiki/api.php'),
('tmnet','http://www.technomanifestos.net/?$1',0,''),
('theopedia','http://www.theopedia.com/$1',0,''),
('twiki','http://twiki.org/cgi-bin/view/$1',0,''),
-('uea','http://uea.org/vikio/index.php/$1',0,'http://uea.org/vikio/api.php'),
('uncyclopedia','http://en.uncyclopedia.co/wiki/$1',0,'http://en.uncyclopedia.co/w/api.php'),
('unreal','http://wiki.beyondunreal.com/$1',0,'http://wiki.beyondunreal.com/w/api.php'),
('usemod','http://www.usemod.com/cgi-bin/wiki.pl?$1',0,''),
-('webseitzwiki','http://webseitz.fluxent.com/wiki/$1',0,''),
('wiki','http://c2.com/cgi/wiki?$1',0,''),
('wikia','http://www.wikia.com/wiki/$1',0,''),
('wikibooks','https://en.wikibooks.org/wiki/$1',0,'https://en.wikibooks.org/w/api.php'),
--- /dev/null
+-- Primary key in change_tag table
+
+ALTER TABLE /*_*/change_tag ADD ct_id INT IDENTITY;
+ALTER TABLE /*_*/change_tag ADD CONSTRAINT pk_change_tag PRIMARY KEY(ct_id)
--- /dev/null
+-- Primary key in tag_summary table
+
+ALTER TABLE /*_*/tag_summary ADD ts_id INT IDENTITY;
+ALTER TABLE /*_*/tag_summary ADD CONSTRAINT pk_tag_summary PRIMARY KEY(ts_id)
-- A table to track tags for revisions, logs and recent changes.
CREATE TABLE /*_*/change_tag (
+ ct_id int NOT NULL PRIMARY KEY IDENTITY,
-- RCID for the change
ct_rc_id int NULL REFERENCES /*_*/recentchanges(rc_id),
-- LOGID for the change
-- Rollup table to pull a LIST of tags simply without ugly GROUP_CONCAT
-- that only works on MySQL 4.1+
CREATE TABLE /*_*/tag_summary (
+ ts_id int NOT NULL PRIMARY KEY IDENTITY,
-- RCID for the change
ts_rc_id int NULL REFERENCES /*_*/recentchanges(rc_id),
-- LOGID for the change
--- /dev/null
+define mw_prefix='{$wgDBprefix}';
+
+ALTER TABLE &mw_prefix.change_tag ADD (
+ct_id NUMBER NOT NULL,
+);
+ALTER TABLE &mw_prefix.change_tag ADD CONSTRAINT &mw_prefix.change_tag_pk PRIMARY KEY (ct_id);
--- /dev/null
+define mw_prefix='{$wgDBprefix}';
+
+ALTER TABLE &mw_prefix.tag_summary ADD (
+ts_id NUMBER NOT NULL,
+);
+ALTER TABLE &mw_prefix.tag_summary ADD CONSTRAINT &mw_prefix.tag_summary_pk PRIMARY KEY (ts_id);
ALTER TABLE &mw_prefix.updatelog ADD CONSTRAINT &mw_prefix.updatelog_pk PRIMARY KEY (ul_key);
CREATE TABLE &mw_prefix.change_tag (
+ ct_id NUMBER NOT NULL,
ct_rc_id NUMBER NULL,
ct_log_id NUMBER NULL,
ct_rev_id NUMBER NULL,
ct_tag VARCHAR2(255) NOT NULL,
ct_params BLOB NULL
);
+ALTER TABLE &mw_prefix.change_tag ADD CONSTRAINT &mw_prefix.change_tag_pk PRIMARY KEY (ct_id);
CREATE UNIQUE INDEX &mw_prefix.change_tag_u01 ON &mw_prefix.change_tag (ct_rc_id,ct_tag);
CREATE UNIQUE INDEX &mw_prefix.change_tag_u02 ON &mw_prefix.change_tag (ct_log_id,ct_tag);
CREATE UNIQUE INDEX &mw_prefix.change_tag_u03 ON &mw_prefix.change_tag (ct_rev_id,ct_tag);
CREATE INDEX &mw_prefix.change_tag_i01 ON &mw_prefix.change_tag (ct_tag,ct_rc_id,ct_rev_id,ct_log_id);
CREATE TABLE &mw_prefix.tag_summary (
+ ts_id NUMBER NOT NULL,
ts_rc_id NUMBER NULL,
ts_log_id NUMBER NULL,
ts_rev_id NUMBER NULL,
ts_tags BLOB NOT NULL
);
+ALTER TABLE &mw_prefix.tag_summary ADD CONSTRAINT &mw_prefix.tag_summary_pk PRIMARY KEY (ts_id);
CREATE UNIQUE INDEX &mw_prefix.tag_summary_u01 ON &mw_prefix.tag_summary (ts_rc_id);
CREATE UNIQUE INDEX &mw_prefix.tag_summary_u02 ON &mw_prefix.tag_summary (ts_log_id);
CREATE UNIQUE INDEX &mw_prefix.tag_summary_u03 ON &mw_prefix.tag_summary (ts_rev_id);
DROP SEQUENCE IF EXISTS archive_ar_id_seq CASCADE;
DROP SEQUENCE IF EXISTS externallinks_el_id_seq CASCADE;
DROP SEQUENCE IF EXISTS sites_site_id_seq CASCADE;
+DROP SEQUENCE IF EXISTS change_tag_ct_id_seq CASCADE;
+DROP SEQUENCE IF EXISTS tag_summary_ts_id_seq CASCADE;
DROP FUNCTION IF EXISTS page_deleted() CASCADE;
DROP FUNCTION IF EXISTS ts2_page_title() CASCADE;
DROP FUNCTION IF EXISTS ts2_page_text() CASCADE;
CREATE UNIQUE INDEX category_title ON category(cat_title);
CREATE INDEX category_pages ON category(cat_pages);
+CREATE SEQUENCE change_tag_ct_id_seq;
CREATE TABLE change_tag (
+ ct_id INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('change_tag_ct_id_seq'),
ct_rc_id INTEGER NULL,
ct_log_id INTEGER NULL,
ct_rev_id INTEGER NULL,
CREATE UNIQUE INDEX change_tag_rev_tag ON change_tag(ct_rev_id,ct_tag);
CREATE INDEX change_tag_tag_id ON change_tag(ct_tag,ct_rc_id,ct_rev_id,ct_log_id);
+CREATE SEQUENCE tag_summary_ts_id_seq;
CREATE TABLE tag_summary (
- ts_rc_id INTEGER NULL,
- ts_log_id INTEGER NULL,
- ts_rev_id INTEGER NULL,
- ts_tags TEXT NOT NULL
+ ts_id INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('tag_summary_ts_id_seq'),
+ ts_rc_id INTEGER NULL,
+ ts_log_id INTEGER NULL,
+ ts_rev_id INTEGER NULL,
+ ts_tags TEXT NOT NULL
);
CREATE UNIQUE INDEX tag_summary_rc_id ON tag_summary(ts_rc_id);
CREATE UNIQUE INDEX tag_summary_log_id ON tag_summary(ts_log_id);
$this->error( "Unable to open input file", true );
}
- $error = $db->sourceStream( $file, false, [ $this, 'sqlPrintResult' ] );
+ $error = $db->sourceStream( $file, null, [ $this, 'sqlPrintResult' ] );
if ( $error !== true ) {
$this->error( $error, true );
} else {
--- /dev/null
+DROP TABLE IF EXISTS /*_*/change_tag_tmp;
+
+CREATE TABLE /*$wgDBprefix*/change_tag_tmp (
+ ct_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ ct_rc_id int NULL,
+ ct_log_id int NULL,
+ ct_rev_id int NULL,
+ ct_tag varchar(255) NOT NULL,
+ ct_params blob NULL
+);
+
+INSERT OR IGNORE INTO /*_*/change_tag_tmp (
+ ct_rc_id, ct_log_id, ct_rev_id, ct_tag, ct_params )
+ SELECT
+ ct_rc_id, ct_log_id, ct_rev_id, ct_tag, ct_params
+ FROM /*_*/change_tag;
+
+DROP TABLE /*_*/change_tag;
+
+ALTER TABLE /*_*/change_tag_tmp RENAME TO /*_*/change_tag;
+
+CREATE UNIQUE INDEX /*i*/change_tag_rc_tag ON /*_*/change_tag (ct_rc_id,ct_tag);
+CREATE UNIQUE INDEX /*i*/change_tag_log_tag ON /*_*/change_tag (ct_log_id,ct_tag);
+CREATE UNIQUE INDEX /*i*/change_tag_rev_tag ON /*_*/change_tag (ct_rev_id,ct_tag);
+CREATE INDEX /*i*/change_tag_tag_id ON /*_*/change_tag (ct_tag,ct_rc_id,ct_rev_id,ct_log_id);
--- /dev/null
+DROP TABLE IF EXISTS /*_*/tag_summary_tmp;
+
+CREATE TABLE /*$wgDBprefix*/tag_summary_tmp (
+ ts_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ ts_rc_id int NULL,
+ ts_log_id int NULL,
+ ts_rev_id int NULL,
+ ts_tags blob NOT NULL
+);
+
+INSERT OR IGNORE INTO /*_*/tag_summary_tmp (
+ ts_rc_id, ts_log_id, ts_rev_id, ts_tags )
+ SELECT
+ ts_rc_id, ts_log_id, ts_rev_id, ts_tags
+ FROM /*_*/tag_summary;
+
+DROP TABLE /*_*/tag_summary;
+
+ALTER TABLE /*_*/tag_summary_tmp RENAME TO /*_*/tag_summary;
+
+CREATE UNIQUE INDEX /*i*/tag_summary_rc_id ON /*_*/tag_summary (ts_rc_id);
+CREATE UNIQUE INDEX /*i*/tag_summary_log_id ON /*_*/tag_summary (ts_log_id);
+CREATE UNIQUE INDEX /*i*/tag_summary_rev_id ON /*_*/tag_summary (ts_rev_id);
-- A table to track tags for revisions, logs and recent changes.
CREATE TABLE /*_*/change_tag (
+ ct_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
-- RCID for the change
ct_rc_id int NULL,
-- LOGID for the change
-- Rollup table to pull a LIST of tags simply without ugly GROUP_CONCAT
-- that only works on MySQL 4.1+
CREATE TABLE /*_*/tag_summary (
+ ts_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
-- RCID for the change
ts_rc_id int NULL,
-- LOGID for the change
'feedback-cancel',
'feedback-close',
'feedback-dialog-title',
- 'feedback-error-title',
'feedback-error1',
'feedback-error2',
'feedback-error3',
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
*/
( function ( OO ) {
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
*/
.oo-ui-element-hidden {
display: none !important;
max-width: 100%;
padding: 0;
white-space: normal;
+ float: left;
+}
+.oo-ui-fieldsetLayout-group {
+ clear: both;
}
.oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-help {
float: right;
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
*/
.oo-ui-element-hidden {
display: none !important;
max-width: 100%;
padding: 0;
white-space: normal;
+ float: left;
+}
+.oo-ui-fieldsetLayout-group {
+ clear: both;
}
.oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-help {
float: right;
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
*/
( function ( OO ) {
}
// Initialization
+ this.$group.addClass( 'oo-ui-fieldsetLayout-group' );
this.$element
.addClass( 'oo-ui-fieldsetLayout' )
.prepend( this.$label, this.$help, this.$icon, this.$group );
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
*/
( function ( OO ) {
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
*/
.oo-ui-popupTool .oo-ui-popupWidget-popup,
.oo-ui-popupTool .oo-ui-popupWidget-anchor {
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
*/
.oo-ui-tool.oo-ui-widget-enabled {
-webkit-transition: background-color 100ms;
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
*/
( function ( OO ) {
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
*/
.oo-ui-draggableElement-handle,
.oo-ui-draggableElement-handle.oo-ui-widget {
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
*/
.oo-ui-draggableElement-handle,
.oo-ui-draggableElement-handle.oo-ui-widget {
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
*/
( function ( OO ) {
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
*/
.oo-ui-actionWidget.oo-ui-pendingElement-pending {
background-image: /* @embed */ url(themes/apex/images/textures/pending.gif);
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
*/
.oo-ui-window {
background: transparent;
/*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2016 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2016-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
*/
( function ( OO ) {
]
};
break;
- case 'error1':
- case 'error2':
- case 'error3':
- case 'error4':
- dialogConfig = {
- title: mw.msg( 'feedback-error-title' ),
- message: mw.msg( 'feedback-' + status ),
- actions: [
- {
- action: 'accept',
- label: mw.msg( 'feedback-close' ),
- flags: 'primary'
- }
- ]
- };
- break;
}
// Show the message dialog
}, function () {
fb.status = 'error4';
mw.log.warn( 'Feedback report failed because MessagePoster could not be fetched' );
- } ).always( function () {
+ } ).then( function () {
fb.close();
+ }, function () {
+ return fb.getErrorMessage();
} );
}, this );
}
return mw.Feedback.Dialog.parent.prototype.getActionProcess.call( this, action );
};
+ /**
+ * Returns an error message for the current status.
+ *
+ * @private
+ *
+ * @return {OO.ui.Error}
+ */
+ mw.Feedback.Dialog.prototype.getErrorMessage = function () {
+ switch ( this.status ) {
+ case 'error1':
+ case 'error2':
+ case 'error3':
+ case 'error4':
+ // Messages: feedback-error1, feedback-error2, feedback-error3, feedback-error4
+ return new OO.ui.Error( mw.msg( 'feedback-' + this.status ) );
+ }
+ };
+
/**
* Posts the message
*
dépôts / lhc / web / wiklou.git / commitdiff