From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 18 Nov 2020 15:43:45 +0000 (+0100)
Subject: Fix curl_multi_getcontent() parameter name
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06c4a501fdfb800d93725c4bb2b8b95e397ce07c;p=php

Fix curl_multi_getcontent() parameter name

While the function name starts with curl_multi_*, the function
actually accepts a CurlHandle. As such, it should also use just
$handle as the parameter name.

Closes GH-6435.
---

diff --git a/ext/curl/curl.stub.php b/ext/curl/curl.stub.php
index 2eba460d6c..8fd8fd91c5 100644
--- a/ext/curl/curl.stub.php
+++ b/ext/curl/curl.stub.php
@@ -48,7 +48,7 @@ function curl_multi_errno(CurlMultiHandle $multi_handle): int {}
 /** @param int $still_running */
 function curl_multi_exec(CurlMultiHandle $multi_handle, &$still_running): int {}
 
-function curl_multi_getcontent(CurlHandle $multi_handle): ?string {}
+function curl_multi_getcontent(CurlHandle $handle): ?string {}
 
 /** @param int $queued_messages */
 function curl_multi_info_read(CurlMultiHandle $multi_handle, &$queued_messages = null): array|false {}
diff --git a/ext/curl/curl_arginfo.h b/ext/curl/curl_arginfo.h
index e213f9d318..e6bb94b7b4 100644
--- a/ext/curl/curl_arginfo.h
+++ b/ext/curl/curl_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: afeae538b49eb43a661e5b491da79c17d10c6bfe */
+ * Stub hash: f1d616c644ad366405816cde0384f6f391773ebf */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_close, 0, 1, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
@@ -74,7 +74,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_multi_exec, 0, 2, IS_LONG,
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_curl_multi_getcontent, 0, 1, IS_STRING, 1)
-	ZEND_ARG_OBJ_INFO(0, multi_handle, CurlHandle, 0)
+	ZEND_ARG_OBJ_INFO(0, handle, CurlHandle, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_curl_multi_info_read, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)