From: Bill Pirkle <bpirkle@wikimedia.org>
Date: Thu, 13 Dec 2018 17:02:09 +0000 (-0600)
Subject: Temporarily remove guzzle as default for HttpRequestFactory
X-Git-Tag: 1.34.0-rc.0~3256^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=eefe4126a5fe437d08f90ef786e7aa0d83ea7154;p=lhc%2Fweb%2Fwiklou.git

Temporarily remove guzzle as default for HttpRequestFactory

Temporarily switching back to curl/php as the default for
HttpRequest objects, to resolve production issues until a
long-term fix for the out-of-memory issue from T211886 is implemented.

Bug: T211886
Change-Id: I6201ac1292b41f82d920a431376d791a666355e8
---

diff --git a/includes/http/HttpRequestFactory.php b/includes/http/HttpRequestFactory.php
index a3a14d0aec..0faef17325 100644
--- a/includes/http/HttpRequestFactory.php
+++ b/includes/http/HttpRequestFactory.php
@@ -44,7 +44,7 @@ class HttpRequestFactory {
 	 */
 	public function create( $url, array $options = [], $caller = __METHOD__ ) {
 		if ( !Http::$httpEngine ) {
-			Http::$httpEngine = 'guzzle';
+			Http::$httpEngine = function_exists( 'curl_init' ) ? 'curl' : 'php';
 		} elseif ( Http::$httpEngine == 'curl' && !function_exists( 'curl_init' ) ) {
 			throw new DomainException( __METHOD__ . ': curl (https://secure.php.net/curl) is not ' .
 			   'installed, but Http::$httpEngine is set to "curl"' );