diff options
| author | Abyr Valg <valga@abyrga.ru> | 2019-07-17 21:46:40 +0300 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-18 14:40:47 +0200 |
| commit | c8c183eb62b666b5e9c92ca2cbf13f5464ae3aa9 (patch) | |
| tree | 6de8ae21f4af23e9d53d23002e27929c27e20359 /ext/curl/multi.c | |
| parent | b864abfe23fde5d79a303519674ba83062f89361 (diff) | |
| download | php-git-c8c183eb62b666b5e9c92ca2cbf13f5464ae3aa9.tar.gz | |
Fixed bug #77946
Save multi_info_read() result into easy handle.
Diffstat (limited to 'ext/curl/multi.c')
| -rw-r--r-- | ext/curl/multi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/curl/multi.c b/ext/curl/multi.c index 1d325bc329..f86e08aff4 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -339,6 +339,7 @@ PHP_FUNCTION(curl_multi_info_read) CURLMsg *tmp_msg; int queued_msgs; zval *zmsgs_in_queue = NULL; + php_curl *ch; ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_RESOURCE(z_mh) @@ -376,6 +377,10 @@ PHP_FUNCTION(curl_multi_info_read) being done in add_assoc_resource */ Z_ADDREF_P(pz_ch); + /* we must save result to be able to read error message */ + ch = (php_curl*)zend_fetch_resource(Z_RES_P(pz_ch), le_curl_name, le_curl); + SAVE_CURL_ERROR(ch, tmp_msg->data.result); + /* add_assoc_resource automatically creates a new zval to wrap the "resource" represented by the current pz_ch */ |