adds cainfo php.ini option and improves debugability

BITPlan · Jan 8, 2016 · 3f68dd3 · 3f68dd3
1 parent cf393a3
commit 3f68dd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/api/ApiPush.php b/api/ApiPush.php
@@ -127,12 +127,12 @@ protected function doLogin( $user, $password, $domain, $target, $token = null, $
 		if ( !is_null( $token ) ) {
 			$requestData['lgtoken'] = $token;
 		}
-
 		$req = PushFunctions::getHttpRequest( $target,
 			array(
 				'postData' => $requestData,
 				'method' => 'POST',
-				'timeout' => 'default'
+				'timeout' => 'default',
+				'caInfo' => ini_get('curl.cainfo')
 			)
 		);
 

diff --git a/includes/Push_Functions.php b/includes/Push_Functions.php
@@ -148,10 +148,11 @@ public static function flipKeys( array &$arr, $id ) {
 	 * @return (MW)HttpRequest
 	 */
 	public static function getHttpRequest( $target, $args ) {
-		return call_user_func_array(
+		$req=call_user_func_array(
 			array( ( class_exists( 'MWHttpRequest' ) ? 'MWHttpRequest' : 'HttpRequest' ), 'factory' ),
 			array( $target, $args )
 		);
+		return $req;
 	}
 
 }