From d65ac78277fc04df431d89ded95d0cdd76cddad0 Mon Sep 17 00:00:00 2001 From: Fomafix Date: Sat, 2 Dec 2017 21:38:29 +0100 Subject: [PATCH] Replace HTTP by HTTPS * https://www.unicode.org/ instead of http://www.unicode.org/ or http://unicode.org/ * https://secure.php.net/ instead of http://www.php.net/ or http://php.net/ * https://hhvm.com/ instead of http://hhvm.com/ * https://www.iis.net/ instead of http://www.iis.net/ Change-Id: I84d818a7e0ced5ffb9485ec89a75efb28a77c1e0 --- includes/compat/normal/UtfNormal.php | 2 +- includes/http/HttpRequestFactory.php | 6 +++--- includes/installer/Installer.php | 2 +- includes/installer/i18n/en.json | 21 ++++++++++--------- includes/libs/filebackend/FSFileBackend.php | 2 +- includes/shell/Command.php | 2 +- includes/specials/SpecialVersion.php | 2 +- languages/Language.php | 6 +++--- languages/data/plurals.xml | 4 ++-- languages/i18n/qqq.json | 18 ++++++++-------- .../language/generateCollationData.php | 4 ++-- .../language/generateNormalizerDataAr.php | 4 ++-- .../language/generateNormalizerDataMl.php | 2 +- maintenance/language/zhtable/Makefile.py | 2 +- maintenance/storage/compressOld.php | 2 +- resources/src/mediawiki.debug/debug.js | 2 +- .../mediawiki.language.numbers.js | 2 +- serialized/Makefile | 6 +++--- tests/phpunit/includes/http/HttpTest.php | 6 +++--- 19 files changed, 48 insertions(+), 47 deletions(-) diff --git a/includes/compat/normal/UtfNormal.php b/includes/compat/normal/UtfNormal.php index 9b35cad485..308bef6458 100644 --- a/includes/compat/normal/UtfNormal.php +++ b/includes/compat/normal/UtfNormal.php @@ -40,7 +40,7 @@ use UtfNormal\Validator; * * All functions can be called static. * - * See description of forms at http://www.unicode.org/reports/tr15/ + * See description of forms at https://www.unicode.org/reports/tr15/ * * @deprecated since 1.25, use UtfNormal\Validator directly * @ingroup UtfNormal diff --git a/includes/http/HttpRequestFactory.php b/includes/http/HttpRequestFactory.php index 80f9b68862..c5413b37d8 100644 --- a/includes/http/HttpRequestFactory.php +++ b/includes/http/HttpRequestFactory.php @@ -45,8 +45,8 @@ class HttpRequestFactory { if ( !Http::$httpEngine ) { Http::$httpEngine = function_exists( 'curl_init' ) ? 'curl' : 'php'; } elseif ( Http::$httpEngine == 'curl' && !function_exists( 'curl_init' ) ) { - throw new DomainException( __METHOD__ . ': curl (http://php.net/curl) is not installed, but' . - ' Http::$httpEngine is set to "curl"' ); + throw new DomainException( __METHOD__ . ': curl (https://secure.php.net/curl) is not ' . + 'installed, but Http::$httpEngine is set to "curl"' ); } if ( !isset( $options['logger'] ) ) { @@ -61,7 +61,7 @@ class HttpRequestFactory { throw new DomainException( __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.' + 'https://secure.php.net/curl.' ); } return new PhpHttpRequest( $url, $options, $caller, Profiler::instance() ); diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 911e5d203b..93da2c34af 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -1137,7 +1137,7 @@ abstract class Installer { /** * This needs to be updated something that the latest libicu * will properly normalize. This normalization was found at - * http://www.unicode.org/versions/Unicode5.2.0/#Character_Additions + * https://www.unicode.org/versions/Unicode5.2.0/#Character_Additions * Note that we use the hex representation to create the code * points in order to avoid any Unicode-destroying during transit. */ diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json index d1a3b83423..412b405775 100644 --- a/includes/installer/i18n/en.json +++ b/includes/installer/i18n/en.json @@ -55,11 +55,12 @@ "config-pcre-no-utf8": "Fatal: PHP's PCRE module seems to be compiled without PCRE_UTF8 support.\nMediaWiki requires UTF-8 support to function correctly.", "config-memory-raised": "PHP's memory_limit is $1, raised to $2.", "config-memory-bad": "Warning: PHP's memory_limit is $1.\nThis is probably too low.\nThe installation may fail!", - "config-apc": "[http://www.php.net/apc APC] is installed", - "config-apcu": "[http://www.php.net/apcu APCu] is installed", - "config-wincache": "[https://www.iis.net/download/WinCacheForPhp WinCache] is installed", - "config-no-cache-apcu": "Warning: Could not find [http://www.php.net/apcu APCu] or [http://www.iis.net/download/WinCacheForPhp WinCache].\nObject caching is not enabled.", + "config-apc": "[https://secure.php.net/apc APC] is installed", + "config-apcu": "[https://secure.php.net/apcu APCu] is installed", + "config-wincache": "[https://www.iis.net/downloads/microsoft/wincache-extension WinCache] is installed", + "config-no-cache-apcu": "Warning: Could not find [https://secure.php.net/apcu APCu] or [https://www.iis.net/downloads/microsoft/wincache-extension WinCache].\nObject caching is not enabled.", "config-mod-security": "Warning: Your web server has [https://modsecurity.org/ mod_security]/mod_security2 enabled. Many common configurations of this will cause problems for MediaWiki and other software that allows users to post arbitrary content.\nIf possible, this should be disabled. Otherwise, refer to [https://modsecurity.org/documentation/ mod_security documentation] or contact your host's support if you encounter random errors.", + "config-diff3-bad": "GNU diff3 not found.", "config-git": "Found the Git version control software: $1.", "config-git-bad": "Git version control software not found.", @@ -111,11 +112,11 @@ "config-type-oracle": "Oracle", "config-type-mssql": "Microsoft SQL Server", "config-support-info": "MediaWiki supports the following database systems:\n\n$1\n\nIf you do not see the database system you are trying to use listed below, then follow the instructions linked above to enable support.", - "config-dbsupport-mysql": "* [{{int:version-db-mysql-url}} MySQL] is the primary target for MediaWiki and is best supported. MediaWiki also works with [{{int:version-db-mariadb-url}} MariaDB] and [{{int:version-db-percona-url}} Percona Server], which are MySQL compatible. ([http://www.php.net/manual/en/mysqli.installation.php How to compile PHP with MySQL support])", - "config-dbsupport-postgres": "* [{{int:version-db-postgres-url}} PostgreSQL] is a popular open source database system as an alternative to MySQL. ([http://www.php.net/manual/en/pgsql.installation.php How to compile PHP with PostgreSQL support])", - "config-dbsupport-sqlite": "* [{{int:version-db-sqlite-url}} SQLite] is a lightweight database system that is very well supported. ([http://www.php.net/manual/en/pdo.installation.php How to compile PHP with SQLite support], uses PDO)", - "config-dbsupport-oracle": "* [{{int:version-db-oracle-url}} Oracle] is a commercial enterprise database. ([http://www.php.net/manual/en/oci8.installation.php How to compile PHP with OCI8 support])", - "config-dbsupport-mssql": "* [{{int:version-db-mssql-url}} Microsoft SQL Server] is a commercial enterprise database for Windows. ([http://www.php.net/manual/en/sqlsrv.installation.php How to compile PHP with SQLSRV support])", + "config-dbsupport-mysql": "* [{{int:version-db-mysql-url}} MySQL] is the primary target for MediaWiki and is best supported. MediaWiki also works with [{{int:version-db-mariadb-url}} MariaDB] and [{{int:version-db-percona-url}} Percona Server], which are MySQL compatible. ([https://secure.php.net/manual/en/mysqli.installation.php How to compile PHP with MySQL support])", + "config-dbsupport-postgres": "* [{{int:version-db-postgres-url}} PostgreSQL] is a popular open source database system as an alternative to MySQL. ([https://secure.php.net/manual/en/pgsql.installation.php How to compile PHP with PostgreSQL support])", + "config-dbsupport-sqlite": "* [{{int:version-db-sqlite-url}} SQLite] is a lightweight database system that is very well supported. ([https://secure.php.net/manual/en/pdo.installation.php How to compile PHP with SQLite support], uses PDO)", + "config-dbsupport-oracle": "* [{{int:version-db-oracle-url}} Oracle] is a commercial enterprise database. ([https://secure.php.net/manual/en/oci8.installation.php How to compile PHP with OCI8 support])", + "config-dbsupport-mssql": "* [{{int:version-db-mssql-url}} Microsoft SQL Server] is a commercial enterprise database for Windows. ([https://secure.php.net/manual/en/sqlsrv.installation.php How to compile PHP with SQLSRV support])", "config-header-mysql": "MySQL settings", "config-header-postgres": "PostgreSQL settings", "config-header-sqlite": "SQLite settings", @@ -220,7 +221,7 @@ "config-license-help": "Many public wikis put all contributions under a [https://freedomdefined.org/Definition free license].\nThis helps to create a sense of community ownership and encourages long-term contribution.\nIt is not generally necessary for a private or corporate wiki.\n\nIf you want to be able to use text from Wikipedia, and you want Wikipedia to be able to accept text copied from your wiki, you should choose {{int:config-license-cc-by-sa}}.\n\nWikipedia previously used the GNU Free Documentation License.\nThe GFDL is a valid license, but it is difficult to understand.\nIt is also difficult to reuse content licensed under the GFDL.", "config-email-settings": "Email settings", "config-enable-email": "Enable outbound email", - "config-enable-email-help": "If you want email to work, [http://www.php.net/manual/en/mail.configuration.php PHP's mail settings] need to be configured correctly.\nIf you do not want any email features, you can disable them here.", + "config-enable-email-help": "If you want email to work, [https://secure.php.net/manual/en/mail.configuration.php PHP's mail settings] need to be configured correctly.\nIf you do not want any email features, you can disable them here.", "config-email-user": "Enable user-to-user email", "config-email-user-help": "Allow all users to send each other email if they have enabled it in their preferences.", "config-email-usertalk": "Enable user talk page notification", diff --git a/includes/libs/filebackend/FSFileBackend.php b/includes/libs/filebackend/FSFileBackend.php index b257e27909..d60e768f86 100644 --- a/includes/libs/filebackend/FSFileBackend.php +++ b/includes/libs/filebackend/FSFileBackend.php @@ -101,7 +101,7 @@ class FSFileBackend extends FileBackendStore { public function getFeatures() { if ( $this->isWindows && version_compare( PHP_VERSION, '7.1', 'lt' ) ) { // PHP before 7.1 used 8-bit code page for filesystem paths on Windows; - // See http://php.net/manual/en/migration71.windows-support.php + // See https://secure.php.net/manual/en/migration71.windows-support.php return 0; } else { return FileBackend::ATTR_UNICODE_PATHS; diff --git a/includes/shell/Command.php b/includes/shell/Command.php index d9fa82dfa3..8ae517eed4 100644 --- a/includes/shell/Command.php +++ b/includes/shell/Command.php @@ -429,7 +429,7 @@ class Command { } // clear get_last_error without actually raising an error - // from http://php.net/manual/en/function.error-get-last.php#113518 + // from https://secure.php.net/manual/en/function.error-get-last.php#113518 // TODO replace with clear_last_error when requirements are bumped to PHP7 set_error_handler( function () { }, 0 ); diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index 6590756f8b..48728a3c1b 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -227,7 +227,7 @@ class SpecialVersion extends SpecialPage { $software = []; $software['[https://www.mediawiki.org/ MediaWiki]'] = self::getVersionLinked(); if ( wfIsHHVM() ) { - $software['[http://hhvm.com/ HHVM]'] = HHVM_VERSION . " (" . PHP_SAPI . ")"; + $software['[https://hhvm.com/ HHVM]'] = HHVM_VERSION . " (" . PHP_SAPI . ")"; } else { $software['[https://php.net/ PHP]'] = PHP_VERSION . " (" . PHP_SAPI . ")"; } diff --git a/languages/Language.php b/languages/Language.php index 705c7288f2..db302d7004 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -273,7 +273,7 @@ class Language { * language, script or variant codes actually exist in the repositories. * * Based on regexes by Mark Davis of the Unicode Consortium: - * http://unicode.org/repos/cldr/trunk/tools/java/org/unicode/cldr/util/data/langtagRegex.txt + * https://www.unicode.org/repos/cldr/trunk/tools/java/org/unicode/cldr/util/data/langtagRegex.txt * * @param string $code * @param bool $lenient Whether to allow '_' as separator. The default is only '-'. @@ -1951,8 +1951,8 @@ class Language { * Gets directionality of the first strongly directional codepoint, for embedBidi() * * This is the rule the BIDI algorithm uses to determine the directionality of - * paragraphs ( http://unicode.org/reports/tr9/#The_Paragraph_Level ) and - * FSI isolates ( http://unicode.org/reports/tr9/#Explicit_Directional_Isolates ). + * paragraphs ( https://www.unicode.org/reports/tr9/#The_Paragraph_Level ) and + * FSI isolates ( https://www.unicode.org/reports/tr9/#Explicit_Directional_Isolates ). * * TODO: Does not handle BIDI control characters inside the text. * TODO: Does not handle unallocated characters. diff --git a/languages/data/plurals.xml b/languages/data/plurals.xml index e364f1bbac..78bfa831af 100644 --- a/languages/data/plurals.xml +++ b/languages/data/plurals.xml @@ -2,8 +2,8 @@ diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 14dbc9f819..25510513ef 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -4472,15 +4472,15 @@ "mediastatistics-header-3d": "Header on [[Special:MediaStatistics]] for file types that are in the 3D category. Includes STL files.", "mediastatistics-header-total": "Header on [[Special:MediaStatistics]] for a summary of all file types.", "json-warn-trailing-comma": "A warning message notifying that JSON text was automatically corrected by removing erroneous commas.\n\nParameters:\n* $1 - number of commas that were removed\n{{Related|Json-error}}", - "json-error-unknown": "User error message when there’s an unknown error.\n\nThis error is shown if we received an unexpected value from PHP. See http://php.net/manual/en/function.json-last-error.php\n\nParameters:\n* $1 - integer error code\n{{Related|Json-error}}", - "json-error-depth": "User error message when the maximum stack depth is exceeded.\nSee http://php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", - "json-error-state-mismatch": "User error message when underflow or the modes mismatch.\n\n'''Underflow''': A data-processing error arising when the absolute value of a computed quantity is smaller than the limits of precision of the computing device, retaining at least one significant digit.\n\nSee http://php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", - "json-error-ctrl-char": "User error message when an unexpected control character has been found.\nSee http://php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", - "json-error-syntax": "User error message when there is a syntax error; a malformed JSON.\nSee http://php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}\n{{Identical|Syntax error}}", - "json-error-utf8": "User error message when there are malformed UTF-8 characters, possibly incorrectly encoded.\nSee http://php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", - "json-error-recursion": "PHP JSON encoding/decoding error. See http://php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", - "json-error-inf-or-nan": "PHP JSON encoding/decoding error. See http://php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", - "json-error-unsupported-type": "PHP JSON encoding/decoding error. See http://php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", + "json-error-unknown": "User error message when there’s an unknown error.\n\nThis error is shown if we received an unexpected value from PHP. See https://secure.php.net/manual/en/function.json-last-error.php\n\nParameters:\n* $1 - integer error code\n{{Related|Json-error}}", + "json-error-depth": "User error message when the maximum stack depth is exceeded.\nSee https://secure.php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", + "json-error-state-mismatch": "User error message when underflow or the modes mismatch.\n\n'''Underflow''': A data-processing error arising when the absolute value of a computed quantity is smaller than the limits of precision of the computing device, retaining at least one significant digit.\n\nSee https://secure.php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", + "json-error-ctrl-char": "User error message when an unexpected control character has been found.\nSee https://secure.php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", + "json-error-syntax": "User error message when there is a syntax error; a malformed JSON.\nSee https://secure.php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}\n{{Identical|Syntax error}}", + "json-error-utf8": "User error message when there are malformed UTF-8 characters, possibly incorrectly encoded.\nSee https://secure.php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", + "json-error-recursion": "PHP JSON encoding/decoding error. See https://secure.php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", + "json-error-inf-or-nan": "PHP JSON encoding/decoding error. See https://secure.php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", + "json-error-unsupported-type": "PHP JSON encoding/decoding error. See https://secure.php.net/manual/en/function.json-last-error.php\n{{Related|Json-error}}", "headline-anchor-title": "Title tooltip for the section anchor symbol, which is a link to the current section. Can be interpreted both as a noun (\"this is a link\") or as a verb (\"use this to link\").", "special-characters-group-latin": "This is the name of a script, or alphabet, not a language.", "special-characters-group-latinextended": "The name of the Latin Extended character set.", diff --git a/maintenance/language/generateCollationData.php b/maintenance/language/generateCollationData.php index fafc1c6c28..aec9252987 100644 --- a/maintenance/language/generateCollationData.php +++ b/maintenance/language/generateCollationData.php @@ -67,8 +67,8 @@ class GenerateCollationData extends Maintenance { // As of January 2013, these links work for all versions of Unicode // between 5.1 and 6.2, inclusive. - $allkeysURL = "http://www.unicode.org/Public/UCA//allkeys.txt"; - $ucdallURL = "http://www.unicode.org/Public//ucdxml/ucd.all.grouped.zip"; + $allkeysURL = "https://www.unicode.org/Public/UCA//allkeys.txt"; + $ucdallURL = "https://www.unicode.org/Public//ucdxml/ucd.all.grouped.zip"; if ( !$allkeysPresent || !$ucdallPresent ) { $icuVersion = IcuCollation::getICUVersion(); diff --git a/maintenance/language/generateNormalizerDataAr.php b/maintenance/language/generateNormalizerDataAr.php index 90ca41e2a6..b8b2b8e8d8 100644 --- a/maintenance/language/generateNormalizerDataAr.php +++ b/maintenance/language/generateNormalizerDataAr.php @@ -35,7 +35,7 @@ class GenerateNormalizerDataAr extends Maintenance { parent::__construct(); $this->addDescription( 'Generate the normalizer data file for Arabic' ); $this->addOption( 'unicode-data-file', 'The local location of the data file ' . - 'from http://unicode.org/Public/UNIDATA/UnicodeData.txt', false, true ); + 'from https://unicode.org/Public/UNIDATA/UnicodeData.txt', false, true ); } public function getDbType() { @@ -61,7 +61,7 @@ class GenerateNormalizerDataAr extends Maintenance { $this->fatalError( 'Unable to open the data file.' ); } - // For the file format, see http://www.unicode.org/reports/tr44/ + // For the file format, see https://www.unicode.org/reports/tr44/ $fieldNames = [ 'Code', 'Name', diff --git a/maintenance/language/generateNormalizerDataMl.php b/maintenance/language/generateNormalizerDataMl.php index 664f06ce65..0bb491f267 100644 --- a/maintenance/language/generateNormalizerDataMl.php +++ b/maintenance/language/generateNormalizerDataMl.php @@ -42,7 +42,7 @@ class GenerateNormalizerDataMl extends Maintenance { public function execute() { $hexPairs = [ - # From http://unicode.org/versions/Unicode5.1.0/#Malayalam_Chillu_Characters + # From https://www.unicode.org/versions/Unicode5.1.0/#Malayalam_Chillu_Characters '0D23 0D4D 200D' => '0D7A', '0D28 0D4D 200D' => '0D7B', '0D30 0D4D 200D' => '0D7C', diff --git a/maintenance/language/zhtable/Makefile.py b/maintenance/language/zhtable/Makefile.py index abe08e4bf3..88128aeda9 100755 --- a/maintenance/language/zhtable/Makefile.py +++ b/maintenance/language/zhtable/Makefile.py @@ -301,7 +301,7 @@ def PHPArray(table): def main(): # Get Unihan.zip: - url = 'http://www.unicode.org/Public/%s/ucd/Unihan.zip' % UNIHAN_VER + url = 'https://www.unicode.org/Public/%s/ucd/Unihan.zip' % UNIHAN_VER han_dest = 'Unihan-%s.zip' % UNIHAN_VER download(url, han_dest) diff --git a/maintenance/storage/compressOld.php b/maintenance/storage/compressOld.php index a67e261e1e..a9b9b9ed39 100644 --- a/maintenance/storage/compressOld.php +++ b/maintenance/storage/compressOld.php @@ -104,7 +104,7 @@ class CompressOld extends Maintenance { global $wgDBname; if ( !function_exists( "gzdeflate" ) ) { $this->fatalError( "You must enable zlib support in PHP to compress old revisions!\n" . - "Please see http://www.php.net/manual/en/ref.zlib.php\n" ); + "Please see https://secure.php.net/manual/en/ref.zlib.php\n" ); } $type = $this->getOption( 'type', 'concat' ); diff --git a/resources/src/mediawiki.debug/debug.js b/resources/src/mediawiki.debug/debug.js index 830ff339f6..3f5a5dba7a 100644 --- a/resources/src/mediawiki.debug/debug.js +++ b/resources/src/mediawiki.debug/debug.js @@ -199,7 +199,7 @@ bitDiv( 'phpversion' ) .append( $( this.data.phpEngine === 'HHVM' ? - 'HHVM' : + 'HHVM' : 'PHP' ) ) .append( ': ' + this.data.phpVersion ); diff --git a/resources/src/mediawiki.language/mediawiki.language.numbers.js b/resources/src/mediawiki.language/mediawiki.language.numbers.js index 2392089cc2..267210c658 100644 --- a/resources/src/mediawiki.language/mediawiki.language.numbers.js +++ b/resources/src/mediawiki.language/mediawiki.language.numbers.js @@ -275,7 +275,7 @@ /** * Apply pattern to format value as a string. * - * Using patterns from [Unicode TR35](http://www.unicode.org/reports/tr35/#Number_Format_Patterns). + * Using patterns from [Unicode TR35](https://www.unicode.org/reports/tr35/#Number_Format_Patterns). * * @param {number} value * @param {string} pattern Pattern string as described by Unicode TR35 diff --git a/serialized/Makefile b/serialized/Makefile index 45aed8802a..0a04d85127 100644 --- a/serialized/Makefile +++ b/serialized/Makefile @@ -23,13 +23,13 @@ first-letters-root.ser: allkeys.txt ucd.all.grouped.xml php ../maintenance/language/generateCollationData.php UnicodeData.txt: - wget http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt + wget https://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt allkeys.txt: - wget http://www.unicode.org/Public/UCA/$(UNICODE_VERSION)/allkeys.txt + wget https://www.unicode.org/Public/UCA/$(UNICODE_VERSION)/allkeys.txt ucd.all.grouped.xml: ucd.all.grouped.zip unzip ucd.all.grouped.zip ucd.all.grouped.xml ucd.all.grouped.zip: - wget http://www.unicode.org/Public/$(UNICODE_VERSION)/ucdxml/ucd.all.grouped.zip + wget https://www.unicode.org/Public/$(UNICODE_VERSION)/ucdxml/ucd.all.grouped.zip diff --git a/tests/phpunit/includes/http/HttpTest.php b/tests/phpunit/includes/http/HttpTest.php index f80d18c657..cd24be415e 100644 --- a/tests/phpunit/includes/http/HttpTest.php +++ b/tests/phpunit/includes/http/HttpTest.php @@ -515,8 +515,8 @@ class MWHttpRequestTester extends MWHttpRequest { if ( !Http::$httpEngine ) { Http::$httpEngine = function_exists( 'curl_init' ) ? 'curl' : 'php'; } elseif ( Http::$httpEngine == 'curl' && !function_exists( 'curl_init' ) ) { - throw new DomainException( __METHOD__ . ': curl (http://php.net/curl) is not installed, but' . - 'Http::$httpEngine is set to "curl"' ); + throw new DomainException( __METHOD__ . ': curl (https://secure.php.net/curl) is not ' . + 'installed, but Http::$httpEngine is set to "curl"' ); } switch ( Http::$httpEngine ) { @@ -526,7 +526,7 @@ class MWHttpRequestTester extends MWHttpRequest { if ( !wfIniGetBool( 'allow_url_fopen' ) ) { throw new DomainException( __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.' ); + . 'If possible, curl should be used instead. See https://secure.php.net/curl.' ); } return new PhpHttpRequestTester( $url, $options, $caller ); -- 2.20.1