X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22statistiques_visites%22%2C%22%22%29%20.%20%22?a=blobdiff_plain;f=includes%2Fhttp%2FPhpHttpRequest.php;h=06363145778ebe8d49d685066a4bf60f962f6db8;hb=9aa56950c2a83809b17506ad69c2918cd22a0eed;hp=d8a9949d2f42c9d263a311fdf1e2f4ed65c43935;hpb=0e473dd4ce7f17efd215192fe8c70b467394465e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/http/PhpHttpRequest.php b/includes/http/PhpHttpRequest.php index d8a9949d2f..0636314577 100644 --- a/includes/http/PhpHttpRequest.php +++ b/includes/http/PhpHttpRequest.php @@ -47,13 +47,11 @@ class PhpHttpRequest extends MWHttpRequest { 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' ), @@ -88,12 +86,19 @@ 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; $this->fopenErrors += [ "errno$n" => $errno, "errstr$n" => $errstr ]; } + /** + * @see MWHttpRequest::execute + * + * @return Status + */ public function execute() { $this->prepare();