X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fhttp%2FPhpHttpRequest.php;h=0f499c23021256e624f45747b042d614589ffa2a;hp=3f3803b41cb6c58b88fb2f22ccb9e2b6de9cdadf;hb=aec80a1fb774715e43430ab583c190b79e468fce;hpb=17b3bab4d636df56e4a4b55e52fcda9fde892804

diff --git a/includes/http/PhpHttpRequest.php b/includes/http/PhpHttpRequest.php
index 3f3803b41c..0f499c2302 100644
--- a/includes/http/PhpHttpRequest.php
+++ b/includes/http/PhpHttpRequest.php
@@ -46,23 +46,6 @@ class PhpHttpRequest extends MWHttpRequest {
 		$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 ) {
@@ -88,6 +71,8 @@ class PhpHttpRequest extends MWHttpRequest {
 	 * so normal methods of handling errors programmatically
 	 * like get_last_error() don't work.
 	 * @internal
+	 * @param int $errno
+	 * @param string $errstr
 	 */
 	public function errorHandler( $errno, $errstr ) {
 		$n = count( $this->fopenErrors ) + 1;