Merge branch 'PHP-7.1' into PHP-7.2

diff --cc NEWS
index fa5b68f596a2e21148254f0a4d23364108261dbe,a7e900145b5dac497b0cfd05e375cbb5e3c3986e..166745444abe36b3812129d2ab143fdb0dd78d38
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,11 +1,15 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.1.23
 +?? ??? 2018, PHP 7.2.11
 +
 +- Core:
 +  . Fixed bug #76800 (foreach inconsistent if array modified during loop).
 +    (Dmitry)
  
+ - CURL:
+   . Fixed bug #76480 (Use curl_multi_wait() so that timeouts are respected).
+     (Pierrick)
+ 
  - Opcache:
    . Fixed bug #76832 (ZendOPcache.MemoryBase periodically deleted by the OS).
      (Anatol)

diff --cc ext/curl/multi.c
index 55c33a8c4ffa04c7f37c02685bbf49c7de09994b,7a41b22ea2bad483bf7fcfb1013161f2db52d9fd..3afe8ac413b41c95d03ca1e7a9b536d53678ed5e
--- 1/ext/curl/multi.c
--- 2/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@@ -212,15 -216,13 +218,15 @@@ PHP_FUNCTION(curl_multi_select
        fd_set          writefds;
        fd_set          exceptfds;
        int             maxfd;
-       double          timeout = 1.0;
        struct timeval  to;
+ #endif
        CURLMcode error = CURLM_OK;
  
 -      if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|d", &z_mh, &timeout) == FAILURE) {
 -              return;
 -      }
 +      ZEND_PARSE_PARAMETERS_START(1,2)
 +              Z_PARAM_RESOURCE(z_mh)
 +              Z_PARAM_OPTIONAL
 +              Z_PARAM_DOUBLE(timeout)
 +      ZEND_PARSE_PARAMETERS_END();
  
        if ((mh = (php_curlm *)zend_fetch_resource(Z_RES_P(z_mh), le_curl_multi_handle_name, le_curl_multi_handle)) == NULL) {
                RETURN_FALSE;