Merge branch 'PHP-7.3' into PHP-7.4

diff --cc ext/curl/interface.c
index bc3bf0db49e6825a24be63af550ce65cf8955ad9,99e5deb7589328e7da1e7faeb159d4d6af8dee26..6b42ddafa6906733a90d9e02acdbbf5a50d89924
--- 1/ext/curl/interface.c
--- 2/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -97,9 -112,44 +97,6 @@@ static ZEND_ATTRIBUTE_UNUSED unsigned l
  static void _php_curl_close_ex(php_curl *ch);
  static void _php_curl_close(zend_resource *rsrc);
  
- #define SAVE_CURL_ERROR(__handle, __err) \
-     do { (__handle)->err.no = (int) __err; } while (0)
--
  #define CAAL(s, v) add_assoc_long_ex(return_value, s, sizeof(s) - 1, (zend_long) v);
  #define CAAD(s, v) add_assoc_double_ex(return_value, s, sizeof(s) - 1, (double) v);
  #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s) - 1, (char *) (v ? v : ""));

diff --cc ext/curl/multi.c
Simple merge

diff --cc ext/curl/php_curl.h
index 359d6058efde85b146e99d5d9f68b9b1f628cd98,0a0da5aa02e6c9653dac23713e3278dc40c2dae9..5d93f16c039298bc9cf8b1308dcb18a41b368250
--- 1/ext/curl/php_curl.h
--- 2/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@@ -58,6 -58,8 +58,9 @@@ extern zend_module_entry curl_module_en
  #define PHP_CURL_RETURN 4
  #define PHP_CURL_IGNORE 7
  
 -#define SAVE_CURL_ERROR(__handle, __err) (__handle)->err.no = (int) __err;
++#define SAVE_CURL_ERROR(__handle, __err) \
++    do { (__handle)->err.no = (int) __err; } while (0)
+ 
  extern int  le_curl;
  #define le_curl_name "cURL handle"
  extern int  le_curl_multi_handle;