archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Fix #79033: Curl timeout error with specific url and post
This commit is contained in:
Christoph M. Becker 2019-12-28 10:49:56 +01:00
commit 86675dd3f9
2 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/curl/interface.c
View file

@ -2605,7 +2605,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
zend_string *string_key;
zend_ulong num_key;
#if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 */
curl_mime *mime;
curl_mime *mime = NULL;
curl_mimepart *part;
CURLcode form_error;
#else
@ -2620,9 +2620,11 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{
}
#if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 */
mime = curl_mime_init(ch->cp);
if (mime == NULL) {
return FAILURE;
if (zend_hash_num_elements(postfields) > 0) {
mime = curl_mime_init(ch->cp);
if (mime == NULL) {
return FAILURE;
}
}
#endif