Merge branch 'PHP-7.2' into PHP-7.3

diff --cc NEWS
index 0db2aabc837bc8a69c85aa85e0b04bd408001f55,307a1926d1850efe989906e198f0570b17b08321..10bfe1edcfa8d6b8515506becac816f9bb36dc2e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,39 -1,28 +1,41 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.2.11
 +?? ??? ????, PHP 7.3.0RC1
 +
 +- Core:
 +  . Fixed bug #76820 (Z_COPYABLE invalid definition). (mvdwerve, cmb)
 +
 +- intl:
 +  . Fixed bug #76829 (Incorrect validation of domain on idn_to_utf8()
 +    function). (Anatol)
 +
 +- MBString:
 +  . Updated to Oniguruma 6.9.0. (cmb)
  
  - POSIX:
 -  . Fixed bug #75696 (posix_getgrnam fails to print details of group). (cmb)
 +  Fixed bug #75696 (posix_getgrnam fails to print details of group). (cmb)
  
  - Standard:
 +  . Fixed bug #76803 (ftruncate changes file pointer). (Anatol)
 +  . Fixed bug #76818 (Memory corruption and segfault). (Remi)
+   . Fixed bug #73457 (Wrong error message when fopen FTP wrapped fails to open
+     data connection). (Ville Hukkamäki)
  
 -13 Sep 2018, PHP 7.2.10
 +30 Aug 2018, PHP 7.3.0beta3
  
  - Core:
 +  . Fixed #76773 (Traits used on the parent are ignored for child classes).
 +    (daverandom)
 +  . Fixed #76767 (‘asm’ operand has impossible constraints in zend_operators.h).
 +    (ondrej)
    . Fixed bug #76754 (parent private constant in extends class memory leak).
      (Laruence)
 -  . Fixed bug #72443 (Generate enabled extension). (petk)
 -  . Fixed bug #75797 (Memory leak when using class_alias() in non-debug mode).
 -    (Massimiliano Braglia)
 -
 -- Bz2:
 -  . Fixed arginfo for bzcompress. (Tyson Andre)
 +  . Fixed bug #76752 (Crash in ZEND_COALESCE_SPEC_TMP_HANDLER - assertion in
 +    _get_zval_ptr_tmp failed). (Laruence)
  
 -- gettext:
 -  . Fixed bug #76517 (incorrect restoring of LDFLAGS). (sji)
 +- DOM:
 +  . Fixed bug #76285 (DOMDocument::formatOutput attribute sometimes ignored).
 +    (Andrew Nester, Laruence, Anatol)
  
  - iconv:
    . Fixed bug #68180 (iconv_mime_decode can return extra characters in a 

diff --cc ext/ftp/tests/server.inc
index fb9ff57225e2b625757b55c75ad83364a75903a0,67531de995a1dc5d43462304275599a521931dd4..53501060a5d2a9d5e40f8bfdb8b29dfe620c17d0
--- 1/ext/ftp/tests/server.inc
--- 2/ext/ftp/tests/server.inc
+++ b/ext/ftp/tests/server.inc
@@@ -519,9 -528,10 +529,11 @@@ if ($pid) 
  
                        fputs($s, "226 Closing data Connection.\r\n");
                        fclose($fs);
 -              }else {
+               }elseif (preg_match('/^SIZE \/bug73457/', $buf)) {
+                       fputs($s, "213 10\r\n");
 +              }elseif (preg_match("/^SITE/", $buf)) {
                        fputs($s, "500 Syntax error, command unrecognized.\r\n");
 +              }else {
                        dump_and_exit($buf);
                }
        }

diff --cc ext/standard/ftp_fopen_wrapper.c
index 8628e9b106f74abac0f63605f3c15a02de3ab7c5,b6814e753a61db5c5b08c4fa600a76d254d9814d..a0416ba0f11eb7ce1e768f12bbad0fa8ddb85ed3
--- 1/ext/standard/ftp_fopen_wrapper.c
--- 2/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@@ -551,12 -553,13 +552,13 @@@ php_stream * php_stream_url_wrap_ftp(ph
  
        /* open the data channel */
        if (hoststart == NULL) {
 -              hoststart = resource->host;
 +              hoststart = ZSTR_VAL(resource->host);
        }
        transport_len = (int)spprintf(&transport, 0, "tcp://%s:%d", hoststart, portno);
-       datastream = php_stream_xport_create(transport, transport_len, REPORT_ERRORS, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, NULL, NULL, context, NULL, NULL);
+       datastream = php_stream_xport_create(transport, transport_len, REPORT_ERRORS, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, NULL, NULL, context, &error_message, NULL);
        efree(transport);
        if (datastream == NULL) {
+               tmp_line[0]='\0';
                goto errexit;
        }