jenkins-bot has submitted this change and it was merged.
Change subject: Set the "error" field in the right array
......................................................................
Set the "error" field in the right array
Change-Id: Id822ceb53c57daac0000bef3b304bb0260efe4ce
---
M includes/libs/MultiHttpClient.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/MultiHttpClient.php
b/includes/libs/MultiHttpClient.php
index 00cd257..340e7f4 100644
--- a/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@ -211,7 +211,8 @@
$ch = $handles[$index];
curl_multi_remove_handle( $chm, $ch );
if ( curl_errno( $ch ) !== 0 ) {
- $req['error'] = "(curl error: " . curl_errno(
$ch ) . ") " . curl_error( $ch );
+ $req['response']['error'] = "(curl error: " .
+ curl_errno( $ch ) . ") " . curl_error(
$ch );
}
// For convenience with the list() operator
$req['response'][0] = $req['response']['code'];
--
To view, visit https://gerrit.wikimedia.org/r/124394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id822ceb53c57daac0000bef3b304bb0260efe4ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
