Merge branch 'PHP-7.1' into PHP-7.2

diff --cc NEWS
index 60160d6a9f67582a3e5d6f8b737e70d29db85c95,837d306650366ea7d06c4bf6d2837d2a50dc28b3..ee75ecd908ce3d9cf7dfdaedf4a1c99eac1ce503
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -8,21 -6,20 +8,25 @@@ PH
    . Fixed bug #76946 (Cyclic reference in generator not detected). (Nikita)
  
  - FCGI:
 -  . Fixed bug #76948 (Failed shutdown/reboot or end session in Windows).
 -    (Anatol)
 +  . Fixed #76948 (Failed shutdown/reboot or end session in Windows). (Anatol)
  
 -11 Oct 2018, PHP 7.1.23
+ - FTP:
+   . Fixed bug #76972 (Data truncation due to forceful ssl socket shutdown).
+     (Manuel Mausz)
+ 
 +- Reflection:
 +  . Fixed bug #76936 (Objects cannot access their private attributes while
 +    handling reflection errors). (Nikita)
 +  . Fixed bug #66430 (ReflectionFunction::invoke does not invoke closure with
 +    object scope). (Nikita)
 +
 +11 Oct 2018, PHP 7.2.11
  
  - Core:
 +  . Fixed bug #76800 (foreach inconsistent if array modified during loop).
 +    (Dmitry)
    . Fixed bug #76901 (method_exists on SPL iterator passthrough method corrupts
      memory). (Nikita)
 -  . Fixed bug #76846 (Segfault in shutdown function after memory limit error).
 -    (Nikita)
  
  - CURL:
    . Fixed bug #76480 (Use curl_multi_wait() so that timeouts are respected).

diff --cc ext/ftp/ftp.c
index 6d03f86d17c63e7bc10ef8775b63c3d51258f609,88553b969c29ce8de87900c97649136d60be5306..9b409026a7f44774fb6ff2d3341f4b0a5a0c2060
--- 1/ext/ftp/ftp.c
--- 2/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@@ -98,8 -110,13 +99,13 @@@ static databuf_t*  data_accept(databuf_
  static databuf_t*     data_close(ftpbuf_t *ftp, databuf_t *data);
  
  /* generic file lister */
 -static char**         ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path);
 +static char**         ftp_genlist(ftpbuf_t *ftp, const char *cmd, const size_t cmd_len, const char *path, const size_t path_len);
  
+ #ifdef HAVE_FTP_SSL
+ /* shuts down a TLS/SSL connection */
+ static void           ftp_ssl_shutdown(ftpbuf_t *ftp, php_socket_t fd, SSL *ssl_handle);
+ #endif
+ 
  /* IP and port conversion box */
  union ipbox {
        struct in_addr  ia[2];