Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79019: Copied cURL handles upload empty file

diff --cc ext/curl/interface.c
index a8d6602572bef1c3fb06370e8f14f0d2bc09dd5d,668f7a71d9353a36c2e974bc2c82a971d7e394f9..23732dcfcbd5c1e1961416263e20fef401acec86
--- 1/ext/curl/interface.c
--- 2/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -3284,8 -3657,12 +3331,11 @@@ static void _php_curl_close_ex(php_cur
                zval_ptr_dtor(&ch->handlers->fnmatch->func_name);
                efree(ch->handlers->fnmatch);
        }
 -#endif
  
        efree(ch->handlers);
+ #if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 */
+       zval_ptr_dtor(&ch->postfields);
+ #endif
        efree(ch);
  }
  /* }}} */

diff --cc ext/curl/php_curl.h
Simple merge

diff --cc ext/curl/tests/bug77711.phpt
index 5845f202ba8b93249eb64a37886cab0c392d0121,8ef5e488919434e52abf7c5e548dbe6e82b5c7fa..dec53d0acb903ceb8a7a2424f19c384c8a4df6f2
--- 1/ext/curl/tests/bug77711.phpt
--- 2/ext/curl/tests/bug77711.phpt
+++ b/ext/curl/tests/bug77711.phpt
@@@ -21,9 -21,11 +21,9 @@@ var_dump(curl_setopt($ch, CURLOPT_POSTF
  var_dump(curl_exec($ch));
  curl_close($ch);
  ?>
 -===DONE===
  --EXPECTF--
  bool(true)
- string(%d) "АБВ.txt|application/octet-stream"
+ string(%d) "АБВ.txt|application/octet-stream|5"
 -===DONE===
  --CLEAN--
  <?php
  @unlink(__DIR__ . '/АБВ.txt');

diff --cc ext/curl/tests/curl_copy_handle_variation3.phpt
index 9a94df8d105e1f5dd62eb9f4bc5ce21c8d98abb5,32946bb4df51e2737e0bee4194b470437727ba4f..ae643f4b3020fe50094e8fed7840e3a2308a058b
--- 1/ext/curl/tests/curl_copy_handle_variation3.phpt
--- 2/ext/curl/tests/curl_copy_handle_variation3.phpt
+++ b/ext/curl/tests/curl_copy_handle_variation3.phpt
@@@ -26,10 -26,12 +26,10 @@@ curl_close($ch1)
  var_dump(curl_exec($ch2));
  curl_close($ch2);
  ?>
 -===DONE===
  --EXPECTF--
  bool(true)
- string(%d) "АБВ.txt|application/octet-stream"
- string(%d) "АБВ.txt|application/octet-stream"
+ string(%d) "АБВ.txt|application/octet-stream|5"
+ string(%d) "АБВ.txt|application/octet-stream|5"
 -===DONE===
  --CLEAN--
  <?php
  @unlink(__DIR__ . '/АБВ.txt');

diff --cc ext/curl/tests/curl_file_upload.phpt
Simple merge

diff --cc ext/curl/tests/curl_file_upload_stream.phpt
index 0bbd87ff7247ea6c81b48e45e5caaa004e1f8b1e,949cccbc3120afa0ab69d8e6f3d0212c7d24e23f..082130176d5915911bcfed97df08882bbd458768
--- 1/ext/curl/tests/curl_file_upload_stream.phpt
--- 2/ext/curl/tests/curl_file_upload_stream.phpt
+++ b/ext/curl/tests/curl_file_upload_stream.phpt
@@@ -21,6 -21,8 +21,6 @@@ var_dump(curl_setopt($ch, CURLOPT_POSTF
  var_dump(curl_exec($ch));
  curl_close($ch);
  ?>
 -===DONE===
  --EXPECT--
  bool(true)
- string(21) "i-love-php|text/plain"
+ string(24) "i-love-php|text/plain|11"
 -===DONE===